diff --git a/.clang-format-include b/.clang-format-include
index 838e22f1..bf95d83d 100644
--- a/.clang-format-include
+++ b/.clang-format-include
@@ -6,5 +6,4 @@
 + src/**/*.h
 + tests/**/*.cc
 + tests/**/*.h
-+ tests/**/*.cppm
-- tests/catch.h
++ tests/**/*.cppm
\ No newline at end of file
diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md
index 0ae380e7..dfad9b8e 100644
--- a/docs/test_cases/t00002.md
+++ b/docs/test_cases/t00002.md
@@ -158,6 +158,7 @@ private:
             "raw": "/// Abstract foo_a",
             "text": "\n Abstract foo_a\n"
           },
+          "display_name": "foo_a",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -180,6 +181,7 @@ private:
             "line": 10,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
@@ -192,6 +194,7 @@ private:
             "raw": "/// Abstract foo_c",
             "text": "\n Abstract foo_c\n"
           },
+          "display_name": "foo_c",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -214,6 +217,7 @@ private:
             "line": 12,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -259,6 +263,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "foo_a",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -281,6 +286,7 @@ private:
             "line": 18,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -335,6 +341,7 @@ private:
             "raw": "/// Do nothing unless override is provided",
             "text": "\n Do nothing unless override is provided\n"
           },
+          "display_name": "foo_c",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -357,6 +364,7 @@ private:
             "line": 30,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -434,6 +442,7 @@ private:
             "raw": "/**\n     * Forward foo_a\n     */",
             "text": "\n Forward foo_a\n"
           },
+          "display_name": "foo_a",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -456,6 +465,7 @@ private:
             "line": 41,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
@@ -468,6 +478,7 @@ private:
             "raw": "/**\n     * Forward foo_c\n     */",
             "text": "\n Forward foo_c\n"
           },
+          "display_name": "foo_c",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -490,6 +501,7 @@ private:
             "line": 50,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -559,6 +571,7 @@ private:
             "raw": "///\n    /// Forward foo_a\n    ///",
             "text": "\n Forward foo_a\n"
           },
+          "display_name": "foo_a",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -581,6 +594,7 @@ private:
             "line": 66,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
@@ -593,6 +607,7 @@ private:
             "raw": "///\n    /// Forward foo_c\n    ///",
             "text": "\n Forward foo_c\n"
           },
+          "display_name": "foo_c",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -615,6 +630,7 @@ private:
             "line": 75,
             "translation_unit": "t00002.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index a09ec620..8dd7045b 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="383px" preserveAspectRatio="none" style="width:562px;height:383px;" version="1.1" viewBox="0 0 562 383" width="562px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hxwbornw1su9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13rktbsfho0jh" 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"/>
@@ -10,123 +10,123 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="250" x="160" y="16.708">Basic class diagram example</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hxwbornw1su9)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="28.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rktbsfho0jh)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="28.9531"/>
       <ellipse cx="348.25" cy="44.9531" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M348.3594,40.2969 L347.2031,45.375 L349.5313,45.375 L348.3594,40.2969 Z M346.875,38.0625 L349.8594,38.0625 L353.2188,50.4531 L350.7656,50.4531 L350,47.3906 L346.7188,47.3906 L345.9688,50.4531 L343.5313,50.4531 L346.875,38.0625 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="49.1074">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="60.9531" y2="60.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="66.9531"/>
       <ellipse cx="305" cy="71.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="314" y="75.1636">foo_a() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300" y="79.7578"/>
       <ellipse cx="305" cy="84.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="87.9683">foo_c() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="418" y1="94.5625" y2="94.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hxwbornw1su9)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="163.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rktbsfho0jh)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="163.9531"/>
       <ellipse cx="111.5" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,185.5938 Q113.8906,185.8906 113.25,186.0313 Q112.6094,186.1875 111.9063,186.1875 Q109.4063,186.1875 108.0781,184.5469 Q106.7656,182.8906 106.7656,179.7656 Q106.7656,176.6406 108.0781,174.9844 Q109.4063,173.3281 111.9063,173.3281 Q112.6094,173.3281 113.25,173.4844 Q113.9063,173.6406 114.4688,173.9375 L114.4688,176.6563 Q113.8438,176.0781 113.25,175.8125 Q112.6563,175.5313 112.0313,175.5313 Q110.6875,175.5313 110,176.6094 Q109.3125,177.6719 109.3125,179.7656 Q109.3125,181.8594 110,182.9375 Q110.6875,184 112.0313,184 Q112.6563,184 113.25,183.7344 Q113.8438,183.4531 114.4688,182.875 L114.4688,185.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="184.1074">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="195.9531" y2="195.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="75.5" y="201.9531"/>
       <ellipse cx="80.5" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="210.1636">foo_a() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="70.5" x2="168.5" y1="216.7578" y2="216.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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(#f1hxwbornw1su9)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="163.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/a7e2f7a4964a73795072df456d8828296809dbe4/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(#f13rktbsfho0jh)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="163.9531"/>
       <ellipse cx="348.55" cy="179.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.5188,185.5938 Q350.9406,185.8906 350.3,186.0313 Q349.6594,186.1875 348.9563,186.1875 Q346.4563,186.1875 345.1281,184.5469 Q343.8156,182.8906 343.8156,179.7656 Q343.8156,176.6406 345.1281,174.9844 Q346.4563,173.3281 348.9563,173.3281 Q349.6594,173.3281 350.3,173.4844 Q350.9563,173.6406 351.5188,173.9375 L351.5188,176.6563 Q350.8938,176.0781 350.3,175.8125 Q349.7063,175.5313 349.0813,175.5313 Q347.7375,175.5313 347.05,176.6094 Q346.3625,177.6719 346.3625,179.7656 Q346.3625,181.8594 347.05,182.9375 Q347.7375,184 349.0813,184 Q349.7063,184 350.3,183.7344 Q350.8938,183.4531 351.5188,182.875 L351.5188,185.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="184.1074">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="195.9531" y2="195.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="313" y="201.9531"/>
       <ellipse cx="318" cy="206.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="210.1636">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="308" x2="405" y1="216.7578" y2="216.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hxwbornw1su9)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="285.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rktbsfho0jh)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="285.9531"/>
       <ellipse cx="98.75" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.7188,307.5938 Q101.1406,307.8906 100.5,308.0313 Q99.8594,308.1875 99.1563,308.1875 Q96.6563,308.1875 95.3281,306.5469 Q94.0156,304.8906 94.0156,301.7656 Q94.0156,298.6406 95.3281,296.9844 Q96.6563,295.3281 99.1563,295.3281 Q99.8594,295.3281 100.5,295.4844 Q101.1563,295.6406 101.7188,295.9375 L101.7188,298.6563 Q101.0938,298.0781 100.5,297.8125 Q99.9063,297.5313 99.2813,297.5313 Q97.9375,297.5313 97.25,298.6094 Q96.5625,299.6719 96.5625,301.7656 Q96.5625,303.8594 97.25,304.9375 Q97.9375,306 99.2813,306 Q99.9063,306 100.5,305.7344 Q101.0938,305.4531 101.7188,304.875 L101.7188,307.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="306.1074">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="317.9531" y2="317.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="323.9531"/>
       <ellipse cx="44.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="332.1636">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="336.7578"/>
       <ellipse cx="44.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="344.9683">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="351.5625" y2="351.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="357.5625"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="359.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="365.7729">as : std::vector&lt;A *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hxwbornw1su9)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="285.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rktbsfho0jh)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="285.9531"/>
       <ellipse cx="469.25" cy="301.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M472.2188,307.5938 Q471.6406,307.8906 471,308.0313 Q470.3594,308.1875 469.6563,308.1875 Q467.1563,308.1875 465.8281,306.5469 Q464.5156,304.8906 464.5156,301.7656 Q464.5156,298.6406 465.8281,296.9844 Q467.1563,295.3281 469.6563,295.3281 Q470.3594,295.3281 471,295.4844 Q471.6563,295.6406 472.2188,295.9375 L472.2188,298.6563 Q471.5938,298.0781 471,297.8125 Q470.4063,297.5313 469.7813,297.5313 Q468.4375,297.5313 467.75,298.6094 Q467.0625,299.6719 467.0625,301.7656 Q467.0625,303.8594 467.75,304.9375 Q468.4375,306 469.7813,306 Q470.4063,306 471,305.7344 Q471.5938,305.4531 472.2188,304.875 L472.2188,307.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="306.1074">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="317.9531" y2="317.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="323.9531"/>
       <ellipse cx="414.5" cy="328.9531" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="332.1636">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="336.7578"/>
       <ellipse cx="414.5" cy="341.7578" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="344.9683">foo_c() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="351.5625" y2="351.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="357.5625"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="359.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="365.7729">as : std::vector&lt;A *&gt;</text>
     </a>
-    <path d="M150,53.4531 L150,78.5859 A0,0 0 0 0 150,78.5859 L259,78.5859 A0,0 0 0 0 259,78.5859 L259,71.4531 L293.74,65.9531 L259,63.4531 L259,63.4531 L249,53.4531 L150,53.4531 A0,0 0 0 0 150,53.4531 " fill="#FBFB77" filter="url(#f1hxwbornw1su9)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M150,53.4531 L150,78.5859 A0,0 0 0 0 150,78.5859 L259,78.5859 A0,0 0 0 0 259,78.5859 L259,71.4531 L293.74,65.9531 L259,63.4531 L259,63.4531 L249,53.4531 L150,53.4531 A0,0 0 0 0 150,53.4531 " fill="#FBFB77" filter="url(#f13rktbsfho0jh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M249,53.4531 L249,63.4531 L259,63.4531 L249,53.4531 " 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="70.52">This is class A</text>
-    <path d="M6,53.4531 L6,78.5859 A0,0 0 0 0 6,78.5859 L61.94,78.5859 L105.69,163.8331 L69.94,78.5859 L115,78.5859 A0,0 0 0 0 115,78.5859 L115,63.4531 L105,53.4531 L6,53.4531 A0,0 0 0 0 6,53.4531 " fill="#FBFB77" filter="url(#f1hxwbornw1su9)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,53.4531 L6,78.5859 A0,0 0 0 0 6,78.5859 L61.94,78.5859 L105.69,163.8331 L69.94,78.5859 L115,78.5859 A0,0 0 0 0 115,78.5859 L115,63.4531 L105,53.4531 L6,53.4531 A0,0 0 0 0 6,53.4531 " fill="#FBFB77" filter="url(#f13rktbsfho0jh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105,53.4531 L105,63.4531 L115,63.4531 L105,53.4531 " 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="70.52">This is class B</text>
-    <path d="M217,285.9531 L217,324.9531 L181.57,328.9531 L217,332.9531 L217,371.6172 A0,0 0 0 0 217,371.6172 L368,371.6172 A0,0 0 0 0 368,371.6172 L368,295.9531 L358,285.9531 L217,285.9531 A0,0 0 0 0 217,285.9531 " fill="#FBFB77" filter="url(#f1hxwbornw1su9)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M217,285.9531 L217,324.9531 L181.57,328.9531 L217,332.9531 L217,371.6172 A0,0 0 0 0 217,371.6172 L368,371.6172 A0,0 0 0 0 368,371.6172 L368,295.9531 L358,285.9531 L217,285.9531 A0,0 0 0 0 217,285.9531 " fill="#FBFB77" filter="url(#f13rktbsfho0jh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M358,285.9531 L358,295.9531 L368,295.9531 L358,285.9531 " 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="303.02"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="318.1528">This is class D</text>
diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg
index 69ce7e53..effd0756 100644
--- a/docs/test_cases/t00002_class_mermaid.svg
+++ b/docs/test_cases/t00002_class_mermaid.svg
@@ -169,7 +169,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L7">
+        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L7">
           <g title="This is class A" id="classId-C_0000987634239855407298-0" class="node default clickable">
             <rect height="123" width="117.734375" y="-61.5" x="-58.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -198,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L16">
+        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L16">
           <g title="This is class B" id="classId-C_0000594234458687375950-1" class="node default clickable">
             <rect height="79" width="117.734375" y="-39.5" x="-58.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L27">
+        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L27">
           <g title="This is class C - class C has a long comment" id="classId-C_0001142499429598587507-2" class="node default clickable">
             <rect height="79" width="116.828125" y="-39.5" x="-58.4140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
@@ -246,7 +246,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L36">
+        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L36">
           <g title="D" id="classId-C_0000060950494980414724-3" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -280,7 +280,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00002/t00002.cc#L61">
+        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00002/t00002.cc#L61">
           <g title="E" id="classId-C_0002237886670308966220-4" class="node default clickable">
             <rect height="123" width="163.515625" y="-61.5" x="-81.7578125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md
index 1814dcc7..7bcc4ba5 100644
--- a/docs/test_cases/t00003.md
+++ b/docs/test_cases/t00003.md
@@ -235,6 +235,7 @@ int A::static_int = 1;
       "methods": [
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -257,10 +258,12 @@ int A::static_int = 1;
             "line": 9,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -288,10 +291,12 @@ int A::static_int = 1;
             "line": 10,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -319,10 +324,12 @@ int A::static_int = 1;
             "line": 21,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -350,10 +357,12 @@ int A::static_int = 1;
             "line": 22,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "~A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -376,10 +385,12 @@ int A::static_int = 1;
             "line": 23,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "basic_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -402,10 +413,12 @@ int A::static_int = 1;
             "line": 25,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "static_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -428,10 +441,12 @@ int A::static_int = 1;
             "line": 26,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "const_method",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -454,10 +469,12 @@ int A::static_int = 1;
             "line": 27,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "auto_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -480,10 +497,12 @@ int A::static_int = 1;
             "line": 28,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "operator++",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -506,10 +525,12 @@ int A::static_int = 1;
             "line": 30,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "A &"
         },
         {
           "access": "public",
+          "display_name": "operator=",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -537,10 +558,12 @@ int A::static_int = 1;
             "line": 36,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "A &"
         },
         {
           "access": "public",
+          "display_name": "operator=",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -568,10 +591,12 @@ int A::static_int = 1;
             "line": 37,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "A &"
         },
         {
           "access": "public",
+          "display_name": "size",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": true,
@@ -594,10 +619,12 @@ int A::static_int = 1;
             "line": 39,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "std::size_t"
         },
         {
           "access": "public",
+          "display_name": "double_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -625,10 +652,12 @@ int A::static_int = 1;
             "line": 41,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "sum",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -660,10 +689,12 @@ int A::static_int = 1;
             "line": 42,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "default_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -692,10 +723,12 @@ int A::static_int = 1;
             "line": 44,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "default_string",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -728,10 +761,12 @@ int A::static_int = 1;
             "line": 45,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "public",
+          "display_name": "create_from_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -759,10 +794,12 @@ int A::static_int = 1;
             "line": 50,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "A"
         },
         {
           "access": "protected",
+          "display_name": "protected_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -785,10 +822,12 @@ int A::static_int = 1;
             "line": 58,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "private",
+          "display_name": "private_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -811,10 +850,12 @@ int A::static_int = 1;
             "line": 67,
             "translation_unit": "t00003.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "A<T>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -836,6 +877,14 @@ int A::static_int = 1;
               "type": "T"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "T",
+              "template_parameters": []
+            }
+          ],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index de26cbfe..8bfe1080 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="486px" preserveAspectRatio="none" style="width:347px;height:486px;" version="1.1" viewBox="0 0 347 486" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fmbitow6xr754" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1j5isyvbwr46e" 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,227 +9,227 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmbitow6xr754)" height="468.9453" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1j5isyvbwr46e)" height="468.9453" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#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="13" y="45"/>
       <ellipse cx="18" cy="50" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="53.2104">A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L10" 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="57.8047"/>
       <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="66.0151">A(int i) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L21" 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="70.6094"/>
       <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="78.8198">A(A &amp;&amp;) = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L22" 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"/>
       <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="91.6245">A(const A &amp;) = deleted : void</text>
     </a>
     <ellipse cx="18" cy="101.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="90" x="27" y="104.4292">A&lt;T&gt;(T t) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L23" 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="109.0234"/>
       <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="117.2339">~A() = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="123.8281" y2="123.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="129.8281"/>
       <ellipse cx="18" cy="134.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="138.0386">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="142.6328"/>
       <ellipse cx="18" cy="147.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="150.8433">operator=(A &amp; other) noexcept : A &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="157.4375" y2="157.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="163.4375"/>
       <ellipse cx="18" cy="168.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="171.6479">operator++() : A &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="8" x2="335" y1="178.2422" y2="178.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="184.2422"/>
       <ellipse cx="18" cy="189.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="192.4526">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="197.0469"/>
       <ellipse cx="18" cy="202.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="205.2573">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="209.8516"/>
       <ellipse cx="18" cy="214.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="218.062">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="222.6563"/>
       <ellipse cx="18" cy="227.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L50" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="230.8667">create_from_int(int i) : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="235.4609"/>
       <ellipse cx="18" cy="240.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="243.6714">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="248.2656"/>
       <ellipse cx="18" cy="253.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="256.4761">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="261.0703"/>
       <ellipse cx="18" cy="266.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="269.2808">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="273.875"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="275.875"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="282.0854">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="286.6797"/>
       <polygon fill="#FFFF44" points="18,286.6797,22,290.6797,18,294.6797,14,290.6797" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="294.8901">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="299.4844"/>
       <ellipse cx="18" cy="304.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="195" x="27" y="307.6948">size() constexpr const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="312.2891"/>
       <ellipse cx="18" cy="317.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="320.4995">static_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="325.0938"/>
       <ellipse cx="18" cy="330.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="333.3042">sum(const double a, const double b) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="339.8984" y2="339.8984"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" 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="345.8984"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="347.8984"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" 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="354.1089">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L55" 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="358.7031"/>
       <ellipse cx="18" cy="363.7031" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L55" 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="366.9136">auto_member : const unsigned long</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" 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="371.5078"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="373.5078"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" 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="379.7183">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.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="13" y="384.3125"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="386.3125"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L70" 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="392.5229">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L62" 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="397.1172"/>
       <polygon fill="#FFFF44" points="18,397.1172,22,401.1172,18,405.1172,14,401.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L62" 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="405.3276">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L69" 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="409.9219"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="411.9219"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L69" 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="418.1323">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L60" 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="422.7266"/>
       <polygon fill="none" points="18,422.7266,22,426.7266,18,430.7266,14,426.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L60" 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="430.937">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L52" 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="435.5313"/>
       <ellipse cx="18" cy="440.5313" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L52" 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="443.7417">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L54" 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="448.3359"/>
       <ellipse cx="18" cy="453.3359" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L54" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L54" 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="456.5464">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L53" 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="461.1406"/>
       <ellipse cx="18" cy="466.1406" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L53" 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="469.3511">static_int : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00003_class_mermaid.svg b/docs/test_cases/t00003_class_mermaid.svg
index a5041f0d..57dd570b 100644
--- a/docs/test_cases/t00003_class_mermaid.svg
+++ b/docs/test_cases/t00003_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00003/t00003.cc#L7">
+        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00003/t00003.cc#L7">
           <g title="A" id="classId-C_0001371951663534295727-0" class="node default clickable">
             <rect height="739" width="384.75" y="-369.5" x="-192.375" class="outer title-state"/>
             <line y2="-339.5" y1="-339.5" x2="192.375" x1="-192.375" class="divider"/>
diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md
index 3eb44170..1d3810a3 100644
--- a/docs/test_cases/t00004.md
+++ b/docs/test_cases/t00004.md
@@ -132,6 +132,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -154,10 +155,12 @@ public:
             "line": 11,
             "translation_unit": "t00004.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "foo2",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -180,6 +183,7 @@ public:
             "line": 20,
             "translation_unit": "t00004.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index 85932fd5..4f19710b 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="f1ugdx5t75fx6r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fkylaxlnx56c5" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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,38 +28,38 @@
       <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="322" y2="322"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="328"/>
       <ellipse cx="187.5" cy="333" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="196.5" y="336.2104">foo() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="182.5" y="340.8047"/>
       <ellipse cx="187.5" cy="345.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="foo2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="349.0151">foo2() const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="177.5" x2="304.5" y1="355.6094" y2="355.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
@@ -69,16 +69,16 @@
       <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
@@ -87,8 +87,8 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
@@ -97,38 +97,38 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="330" y2="330"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="336"/>
       <ellipse cx="501.5" cy="341" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="344.2104">b_int : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="348.8047"/>
       <ellipse cx="501.5" cy="353.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="357.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
@@ -137,8 +137,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
@@ -147,15 +147,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="201.5" y2="201.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="207.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="209.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="215.7104">b : V</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
@@ -164,16 +164,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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>
@@ -183,8 +183,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ugdx5t75fx6r)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkylaxlnx56c5)" 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/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg
index 68d31612..0e47dd2b 100644
--- a/docs/test_cases/t00004_class_mermaid.svg
+++ b/docs/test_cases/t00004_class_mermaid.svg
@@ -210,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L4">
+        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L4">
           <g title="B" id="classId-C_0001232624428734051711-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L6">
+        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L6">
           <g title="B##AA" id="classId-C_0001630205507215126623-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L9">
+        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L9">
           <g title="A" id="classId-C_0001552274940876611774-2" class="node default clickable">
             <rect height="101" width="160.40625" y="-50.5" x="-80.203125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="80.203125" x1="-80.203125" class="divider"/>
@@ -292,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L13">
+        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L13">
           <g title="A##AA" id="classId-C_0001742499843727859552-3" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -311,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L15">
+        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L15">
           <g title="A##AA##Lights" id="classId-C_0000590936874508841244-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -345,7 +345,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L17">
+        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L17">
           <g title="A##AA##AAA" id="classId-C_0001430186633004282131-5" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -364,7 +364,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L33">
+        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0000287819369330075965-6" class="node default clickable">
             <rect height="57" width="87" y="-28.5" x="-43.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.5" x1="-43.5" class="divider"/>
@@ -383,7 +383,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L23">
+        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L23">
           <g title="C" id="classId-C_0002278328177727440136-7" class="node default clickable">
             <rect height="101" width="118.640625" y="-50.5" x="-59.3203125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.3203125" x1="-59.3203125" class="divider"/>
@@ -412,7 +412,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L27">
+        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L27">
           <g title="C##AA" id="classId-C_0000623940132897927654-8" class="node default clickable">
             <rect height="57" width="60.328125" y="-28.5" x="-30.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -431,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L28">
+        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L28">
           <g title="C##AA##AAA" id="classId-C_0001597801087286500866-9" class="node default clickable">
             <rect height="57" width="105.640625" y="-28.5" x="-52.8203125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -450,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L30">
+        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L30">
           <g title="C##AA##CCC" id="classId-C_0000081819202639599734-10" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -479,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L33">
+        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L33">
           <g title="C##B" id="classId-C_0001381298335849583950-11" class="node default clickable">
             <rect height="79" width="78.125" y="-39.5" x="-39.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0625" x1="-39.0625" class="divider"/>
@@ -503,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L39">
+        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L39">
           <g title="C##CC" id="classId-C_0002037378936100378699-12" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -532,7 +532,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L43">
+        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L43">
           <g title="D" id="classId-C_0000612133170877135796-13" class="node default clickable">
             <rect height="57" width="79" y="-28.5" x="-39.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.5" x1="-39.5" class="divider"/>
@@ -551,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L45">
+        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L45">
           <g title="D##AA" id="classId-C_0001572080057917630922-14" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -585,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00004/t00004.cc#L47">
+        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00004/t00004.cc#L47">
           <g title="D##DD" id="classId-C_0000600916232677555492-15" class="node default clickable">
             <rect height="57" width="112.765625" y="-28.5" x="-56.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.3828125" x1="-56.3828125" class="divider"/>
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index b2f7bd99..20c2d9c6 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="f9hy04aa6vmnk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbgjtw2ghm4z2" 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,205 +9,205 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9hy04aa6vmnk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbgjtw2ghm4z2)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="308" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="308" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <ellipse cx="308" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92.4141"/>
       <ellipse cx="308" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="100.6245">d : const D *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="105.2188"/>
       <ellipse cx="308" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.4292">e : const E &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="118.0234"/>
       <ellipse cx="308" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="126.2339">f : F &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="130.8281"/>
       <ellipse cx="308" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="139.0386">g : G **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="143.6328"/>
       <ellipse cx="308" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="151.8433">h : H ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="156.4375"/>
       <ellipse cx="308" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="164.6479">i : I *&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="169.2422"/>
       <ellipse cx="308" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="177.4526">j : volatile J *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="182.0469"/>
       <ellipse cx="308" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="190.2573">k : K *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="194.8516"/>
       <ellipse cx="308" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="203.062">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="207.6563"/>
       <ellipse cx="308" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="215.8667">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="220.4609"/>
       <ellipse cx="308" cy="225.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="228.6714">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="233.2656"/>
       <ellipse cx="308" cy="238.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="241.4761">some_int_reference : int &amp;</text>
     </a>
     <path d="M285.16,195.65 C219.46,233.13 136.34,281.08 63,325 C57.55,328.26 51.69,331.86 46.28,335.22 " fill="none" id="C_0000630692407373144211&lt;-C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg
index 459bd244..19bc7a46 100644
--- a/docs/test_cases/t00005_class_mermaid.svg
+++ b/docs/test_cases/t00005_class_mermaid.svg
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L3">
+        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L3">
           <g title="A" id="classId-C_0000096355893895780319-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L5">
+        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L5">
           <g title="B" id="classId-C_0001909425857334087541-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L7">
+        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L7">
           <g title="C" id="classId-C_0000968176384460064907-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L9">
+        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L9">
           <g title="D" id="classId-C_0001735599590836186693-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L11">
+        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L11">
           <g title="E" id="classId-C_0000887960136921844658-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L13">
+        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L13">
           <g title="F" id="classId-C_0000772719357856231772-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L15">
+        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L15">
           <g title="G" id="classId-C_0000979147885884736437-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L17">
+        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L17">
           <g title="H" id="classId-C_0001440673301054236675-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L19">
+        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L19">
           <g title="I" id="classId-C_0000109681731550086430-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L21">
+        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L21">
           <g title="J" id="classId-C_0000338330011969650325-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L23">
+        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L23">
           <g title="K" id="classId-C_0002179119389830432509-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00005/t00005.cc#L25">
+        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00005/t00005.cc#L25">
           <g title="R" id="classId-C_0000630692407373144211-11" class="node default clickable">
             <rect height="387" width="245.8125" y="-193.5" x="-122.90625" class="outer title-state"/>
             <line y2="-163.5" y1="-163.5" x2="122.90625" x1="-122.90625" class="divider"/>
diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md
index 3d1aa118..414512cc 100644
--- a/docs/test_cases/t00006.md
+++ b/docs/test_cases/t00006.md
@@ -512,7 +512,7 @@ public:
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00006::E"
+          "type": "E"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 3c237c79..cb753532 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="ffb5cxy3r6j2p" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7vxenkbppx5z" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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>
@@ -147,15 +147,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="448" y2="448"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="454"/>
       <ellipse cx="1232.5" cy="459" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="462.2104">data : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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>
@@ -164,103 +164,103 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffb5cxy3r6j2p)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vxenkbppx5z)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="482" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">a : std::vector&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="482" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">b : std::vector&lt;B *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <ellipse cx="482" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">c : std::map&lt;int,C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92.4141"/>
       <ellipse cx="482" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="100.6245">d : std::map&lt;int,D *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="105.2188"/>
       <ellipse cx="482" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.4292">e : custom_container&lt;E&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="118.0234"/>
       <ellipse cx="482" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="126.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="130.8281"/>
       <ellipse cx="482" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="139.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="143.6328"/>
       <ellipse cx="482" cy="148.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="151.8433">h : std::array&lt;H,10&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="156.4375"/>
       <ellipse cx="482" cy="161.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="164.6479">i : std::array&lt;I *,5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="169.2422"/>
       <ellipse cx="482" cy="174.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="177.4526">j : J[10]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="182.0469"/>
       <ellipse cx="482" cy="187.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="190.2573">k : K *[20]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="194.8516"/>
       <ellipse cx="482" cy="199.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="203.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="207.6563"/>
       <ellipse cx="482" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="215.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
     </a>
     <path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000050153113082434858-&gt;C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg
index daebdb33..534cfe21 100644
--- a/docs/test_cases/t00006_class_mermaid.svg
+++ b/docs/test_cases/t00006_class_mermaid.svg
@@ -270,7 +270,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L7">
+        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L7">
           <g title="A" id="classId-C_0000989095304444672400-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L9">
+        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L9">
           <g title="B" id="classId-C_0000648285260245005311-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -308,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L11">
+        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L11">
           <g title="C" id="classId-C_0000323304333007297774-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -327,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L13">
+        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L13">
           <g title="D" id="classId-C_0001006912399043633492-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -346,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L15">
+        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L15">
           <g title="E" id="classId-C_0001092550394020578978-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -365,7 +365,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L17">
+        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L17">
           <g title="F" id="classId-C_0000965398761810782236-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -384,7 +384,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L19">
+        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L19">
           <g title="G" id="classId-C_0001764732000887030464-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -403,7 +403,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L21">
+        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L21">
           <g title="H" id="classId-C_0001669285599837552146-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -422,7 +422,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L23">
+        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L23">
           <g title="I" id="classId-C_0002234750598599000377-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -441,7 +441,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L25">
+        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L25">
           <g title="J" id="classId-C_0001335933649375465369-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -460,7 +460,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L27">
+        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L27">
           <g title="K" id="classId-C_0001603190364864080123-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -479,7 +479,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L29">
+        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L29">
           <g title="L" id="classId-C_0000305487238408320046-11" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -498,7 +498,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L31">
+        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L31">
           <g title="M" id="classId-C_0001664744512423723275-12" class="node default clickable">
             <rect height="57" width="28.328125" y="-28.5" x="-14.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="14.1640625" x1="-14.1640625" class="divider"/>
@@ -517,7 +517,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L33">
+        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L33">
           <g title="N" id="classId-C_0000950210019792152600-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -536,7 +536,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L35">
+        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L35">
           <g title="NN" id="classId-C_0001662349735899726224-14" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -555,7 +555,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L37">
+        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L37">
           <g title="NNN" id="classId-C_0001963145075481599858-15" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -574,7 +574,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000916380191954937631-16" class="node default clickable">
             <rect height="79" width="181.28125" y="-39.5" x="-90.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="90.640625" x1="-90.640625" class="divider"/>
@@ -598,7 +598,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L39">
+        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L39">
           <g title="custom_container" id="classId-C_0000050153113082434858-17" class="node default clickable">
             <rect height="57" width="182.171875" y="-28.5" x="-91.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="91.0859375" x1="-91.0859375" class="divider"/>
@@ -617,7 +617,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00006/t00006.cc#L44">
+        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00006/t00006.cc#L44">
           <g title="R" id="classId-C_0000303025561016882526-18" class="node default clickable">
             <rect height="343" width="263.578125" y="-171.5" x="-131.7890625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="131.7890625" x1="-131.7890625" class="divider"/>
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index ec5941e8..0f850f0f 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="f1k3h5hb2lsgj5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10ntzz09qrxxp" 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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3h5hb2lsgj5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ntzz09qrxxp)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3h5hb2lsgj5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ntzz09qrxxp)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3h5hb2lsgj5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ntzz09qrxxp)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3h5hb2lsgj5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10ntzz09qrxxp)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="32.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">a : std::unique_ptr&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="32.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">b : std::shared_ptr&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <ellipse cx="32.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">c : std::weak_ptr&lt;C&gt;</text>
     </a>
     <path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000066905874721300157&lt;-C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg
index 91383390..70acd691 100644
--- a/docs/test_cases/t00007_class_mermaid.svg
+++ b/docs/test_cases/t00007_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L5">
+        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L5">
           <g title="A" id="classId-C_0000098876622534017019-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L7">
+        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L7">
           <g title="B" id="classId-C_0000696381312773707784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L9">
+        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L9">
           <g title="C" id="classId-C_0000972031178679364068-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00007/t00007.cc#L11">
+        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00007/t00007.cc#L11">
           <g title="R" id="classId-C_0000066905874721300157-3" class="node default clickable">
             <rect height="123" width="182.671875" y="-61.5" x="-91.3359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="91.3359375" x1="-91.3359375" class="divider"/>
diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md
index 5acd5616..ada54ea5 100644
--- a/docs/test_cases/t00008.md
+++ b/docs/test_cases/t00008.md
@@ -346,12 +346,13 @@ template <> struct E::nested_template<char> {
             "line": 29,
             "translation_unit": "t00008.cc"
           },
-          "type": "B<int,clanguml::t00008::Vector>"
+          "type": "B<int,Vector>"
         }
       ],
       "methods": [
         {
           "access": "public",
+          "display_name": "add",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -379,10 +380,12 @@ template <> struct E::nested_template<char> {
             "line": 33,
             "translation_unit": "t00008.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "D<Items...>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -404,6 +407,14 @@ template <> struct E::nested_template<char> {
               "type": "std::tuple<Items...> *"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": true,
+              "kind": "template_type",
+              "name": "Items...",
+              "template_parameters": []
+            }
+          ],
           "type": "void"
         }
       ],
@@ -453,6 +464,7 @@ template <> struct E::nested_template<char> {
       "methods": [
         {
           "access": "public",
+          "display_name": "get",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -480,6 +492,7 @@ template <> struct E::nested_template<char> {
             "line": 40,
             "translation_unit": "t00008.cc"
           },
+          "template_parameters": [],
           "type": "DT *"
         }
       ],
@@ -514,6 +527,7 @@ template <> struct E::nested_template<char> {
       "methods": [
         {
           "access": "public",
+          "display_name": "getDecl",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -541,6 +555,7 @@ template <> struct E::nested_template<char> {
             "line": 47,
             "translation_unit": "t00008.cc"
           },
+          "template_parameters": [],
           "type": "DeclType *"
         }
       ],
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index ee209a51..a113ea86 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:1039px;height:403px;" version="1.1" viewBox="0 0 1039 403" width="1039px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fl9gmuls00iq2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbapc8dd6oqbe" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" height="124.8281" id="C_0002293517130897538130" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" height="124.8281" id="C_0002293517130897538130" 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>
@@ -19,50 +19,50 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">comparator : CMP</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">ints : std::array&lt;int,N&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <ellipse cx="17" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">pointer : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92.4141"/>
       <ellipse cx="17" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="100.6245">reference : T &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="105.2188"/>
       <ellipse cx="17" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.4292">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="118.0234"/>
       <ellipse cx="17" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="126.2339">values : std::vector&lt;P&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" 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>
@@ -71,15 +71,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="86"/>
       <ellipse cx="261" cy="91" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="94.2104">values : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="490" y="332"/>
       <ellipse cx="548.75" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.7188,353.6406 Q551.1406,353.9375 550.5,354.0781 Q549.8594,354.2344 549.1563,354.2344 Q546.6563,354.2344 545.3281,352.5938 Q544.0156,350.9375 544.0156,347.8125 Q544.0156,344.6875 545.3281,343.0313 Q546.6563,341.375 549.1563,341.375 Q549.8594,341.375 550.5,341.5313 Q551.1563,341.6875 551.7188,341.9844 L551.7188,344.7031 Q551.0938,344.125 550.5,343.8594 Q549.9063,343.5781 549.2813,343.5781 Q547.9375,343.5781 547.25,344.6563 Q546.5625,345.7188 546.5625,347.8125 Q546.5625,349.9063 547.25,350.9844 Q547.9375,352.0469 549.2813,352.0469 Q549.9063,352.0469 550.5,351.7813 Q551.0938,351.5 551.7188,350.9219 L551.7188,353.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="569.25" y="352.1543">B</text>
@@ -88,15 +88,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="364" y2="364"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491" x2="666" y1="372" y2="372"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="496" y="378"/>
       <ellipse cx="501" cy="383" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="510" y="386.2104">template_template : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="526" y="216.5"/>
       <ellipse cx="541" cy="232.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M543.9688,238.1406 Q543.3906,238.4375 542.75,238.5781 Q542.1094,238.7344 541.4063,238.7344 Q538.9063,238.7344 537.5781,237.0938 Q536.2656,235.4375 536.2656,232.3125 Q536.2656,229.1875 537.5781,227.5313 Q538.9063,225.875 541.4063,225.875 Q542.1094,225.875 542.75,226.0313 Q543.4063,226.1875 543.9688,226.4844 L543.9688,229.2031 Q543.3438,228.625 542.75,228.3594 Q542.1563,228.0781 541.5313,228.0781 Q540.1875,228.0781 539.5,229.1563 Q538.8125,230.2188 538.8125,232.3125 Q538.8125,234.4063 539.5,235.4844 Q540.1875,236.5469 541.5313,236.5469 Q542.1563,236.5469 542.75,236.2813 Q543.3438,236 543.9688,235.4219 L543.9688,238.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="555" y="236.6543">B</text>
@@ -105,8 +105,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="248.5" y2="248.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="527" x2="630" y1="256.5" y2="256.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" height="94.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="446" y="23.5"/>
       <ellipse cx="569.75" cy="39.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M572.7188,45.1406 Q572.1406,45.4375 571.5,45.5781 Q570.8594,45.7344 570.1563,45.7344 Q567.6563,45.7344 566.3281,44.0938 Q565.0156,42.4375 565.0156,39.3125 Q565.0156,36.1875 566.3281,34.5313 Q567.6563,32.875 570.1563,32.875 Q570.8594,32.875 571.5,33.0313 Q572.1563,33.1875 572.7188,33.4844 L572.7188,36.2031 Q572.0938,35.625 571.5,35.3594 Q570.9063,35.0781 570.2813,35.0781 Q568.9375,35.0781 568.25,36.1563 Q567.5625,37.2188 567.5625,39.3125 Q567.5625,41.4063 568.25,42.4844 Q568.9375,43.5469 570.2813,43.5469 Q570.9063,43.5469 571.5,43.2813 Q572.0938,43 572.7188,42.4219 L572.7188,45.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="590.25" y="43.6543">D</text>
@@ -115,31 +115,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="466" y="69.7104">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; *) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="447" x2="710" y1="76.3047" y2="76.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="82.3047"/>
       <ellipse cx="457" cy="87.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="466" y="90.5151">add(int i) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="710" y1="97.1094" y2="97.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="103.1094"/>
       <ellipse cx="457" cy="108.1094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="111.3198">ints : B&lt;int,Vector&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="823.5" y="338.5"/>
       <ellipse cx="838.5" cy="354.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.4688,360.1406 Q840.8906,360.4375 840.25,360.5781 Q839.6094,360.7344 838.9063,360.7344 Q836.4063,360.7344 835.0781,359.0938 Q833.7656,357.4375 833.7656,354.3125 Q833.7656,351.1875 835.0781,349.5313 Q836.4063,347.875 838.9063,347.875 Q839.6094,347.875 840.25,348.0313 Q840.9063,348.1875 841.4688,348.4844 L841.4688,351.2031 Q840.8438,350.625 840.25,350.3594 Q839.6563,350.0781 839.0313,350.0781 Q837.6875,350.0781 837,351.1563 Q836.3125,352.2188 836.3125,354.3125 Q836.3125,356.4063 837,357.4844 Q837.6875,358.5469 839.0313,358.5469 Q839.6563,358.5469 840.25,358.2813 Q840.8438,358 841.4688,357.4219 L841.4688,360.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="852.5" y="358.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="370.5" y2="370.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="824.5" x2="862.5" y1="378.5" y2="378.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="852" y="210"/>
       <ellipse cx="867" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M869.9688,231.6406 Q869.3906,231.9375 868.75,232.0781 Q868.1094,232.2344 867.4063,232.2344 Q864.9063,232.2344 863.5781,230.5938 Q862.2656,228.9375 862.2656,225.8125 Q862.2656,222.6875 863.5781,221.0313 Q864.9063,219.375 867.4063,219.375 Q868.1094,219.375 868.75,219.5313 Q869.4063,219.6875 869.9688,219.9844 L869.9688,222.7031 Q869.3438,222.125 868.75,221.8594 Q868.1563,221.5781 867.5313,221.5781 Q866.1875,221.5781 865.5,222.6563 Q864.8125,223.7188 864.8125,225.8125 Q864.8125,227.9063 865.5,228.9844 Q866.1875,230.0469 867.5313,230.0469 Q868.1563,230.0469 868.75,229.7813 Q869.3438,229.5 869.9688,228.9219 L869.9688,231.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="881" y="230.1543">E::nested_template</text>
@@ -147,16 +147,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="15" x="1012" y="219.1387">ET</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="242" y2="242"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="858" y="248"/>
       <ellipse cx="863" cy="253" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="98" x="872" y="256.2104">get(ET * d) : DT *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="853" x2="1024" y1="262.8047" y2="262.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9gmuls00iq2)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbapc8dd6oqbe)" height="60.8047" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="746.5" y="40"/>
       <ellipse cx="765.1" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M768.0688,61.6406 Q767.4906,61.9375 766.85,62.0781 Q766.2094,62.2344 765.5063,62.2344 Q763.0063,62.2344 761.6781,60.5938 Q760.3656,58.9375 760.3656,55.8125 Q760.3656,52.6875 761.6781,51.0313 Q763.0063,49.375 765.5063,49.375 Q766.2094,49.375 766.85,49.5313 Q767.5063,49.6875 768.0688,49.9844 L768.0688,52.7031 Q767.4438,52.125 766.85,51.8594 Q766.2563,51.5781 765.6313,51.5781 Q764.2875,51.5781 763.6,52.6563 Q762.9125,53.7188 762.9125,55.8125 Q762.9125,57.9063 763.6,58.9844 Q764.2875,60.0469 765.6313,60.0469 Q766.2563,60.0469 766.85,59.7813 Q767.4438,59.5 768.0688,58.9219 L768.0688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="779.9" y="60.1543">E::nested_template</text>
@@ -164,11 +164,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="914.5" y="49.1387">char</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="72" y2="72"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="752.5" y="78"/>
       <ellipse cx="757.5" cy="83" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="168" x="766.5" y="86.2104">getDecl(char * c) : DeclType *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="747.5" x2="939.5" y1="92.8047" y2="92.8047"/>
diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg
index 07818610..ee05c28a 100644
--- a/docs/test_cases/t00008_class_mermaid.svg
+++ b/docs/test_cases/t00008_class_mermaid.svg
@@ -114,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L9">
+        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L9">
           <g title="A" id="classId-C_0002293517130897538130-0" class="node default clickable">
             <rect height="189" width="242.171875" y="-94.5" x="-121.0859375" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="121.0859375" x1="-121.0859375" class="divider"/>
@@ -163,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L20">
+        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L20">
           <g title="Vector" id="classId-C_0001677407014842680311-1" class="node default clickable">
             <rect height="79" width="186.203125" y="-39.5" x="-93.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="93.1015625" x1="-93.1015625" class="divider"/>
@@ -187,7 +187,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001968575752686868237-2" class="node default clickable">
             <rect height="79" width="209.328125" y="-39.5" x="-104.6640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="104.6640625" x1="-104.6640625" class="divider"/>
@@ -211,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L24">
+        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L24">
           <g title="B" id="classId-C_0001449136415707203971-3" class="node default clickable">
             <rect height="57" width="118.15625" y="-28.5" x="-59.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.078125" x1="-59.078125" class="divider"/>
@@ -230,7 +230,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L28">
+        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L28">
           <g title="D" id="classId-C_0001562396858816419857-4" class="node default clickable">
             <rect height="123" width="164.84375" y="-61.5" x="-82.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="82.421875" x1="-82.421875" class="divider"/>
@@ -264,7 +264,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L36">
+        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L36">
           <g title="E" id="classId-C_0001787658457052431115-5" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -283,7 +283,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L37">
+        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L37">
           <g title="E##nested_template" id="classId-C_0001549419203490064906-6" class="node default clickable">
             <rect height="79" width="201.734375" y="-39.5" x="-100.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="100.8671875" x1="-100.8671875" class="divider"/>
@@ -307,7 +307,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00008/t00008.cc#L44">
+        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00008/t00008.cc#L44">
           <g title="E##nested_template" id="classId-C_0000033637089897037832-7" class="node default clickable">
             <rect height="79" width="234.203125" y="-39.5" x="-117.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index fa0862ae..abf44460 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="352px" preserveAspectRatio="none" style="width:448px;height:352px;" version="1.1" viewBox="0 0 448 352" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fc8mmhmxnltqk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f6ha6ttp2xx66" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8mmhmxnltqk)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="248.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ha6ttp2xx66)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="248.5" y="8"/>
       <ellipse cx="274.3" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M277.2688,29.6406 Q276.6906,29.9375 276.05,30.0781 Q275.4094,30.2344 274.7063,30.2344 Q272.2063,30.2344 270.8781,28.5938 Q269.5656,26.9375 269.5656,23.8125 Q269.5656,20.6875 270.8781,19.0313 Q272.2063,17.375 274.7063,17.375 Q275.4094,17.375 276.05,17.5313 Q276.7063,17.6875 277.2688,17.9844 L277.2688,20.7031 Q276.6438,20.125 276.05,19.8594 Q275.4563,19.5781 274.8313,19.5781 Q273.4875,19.5781 272.8,20.6563 Q272.1125,21.7188 272.1125,23.8125 Q272.1125,25.9063 272.8,26.9844 Q273.4875,28.0469 274.8313,28.0469 Q275.4563,28.0469 276.05,27.7813 Q276.6438,27.5 277.2688,26.9219 L277.2688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="290.7" y="28.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249.5" x2="322.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249.5" x2="322.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="254.5" y="54"/>
       <ellipse cx="259.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="268.5" y="62.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8mmhmxnltqk)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="374" y="130"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ha6ttp2xx66)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="374" y="130"/>
       <ellipse cx="389" cy="146" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M391.9688,151.6406 Q391.3906,151.9375 390.75,152.0781 Q390.1094,152.2344 389.4063,152.2344 Q386.9063,152.2344 385.5781,150.5938 Q384.2656,148.9375 384.2656,145.8125 Q384.2656,142.6875 385.5781,141.0313 Q386.9063,139.375 389.4063,139.375 Q390.1094,139.375 390.75,139.5313 Q391.4063,139.6875 391.9688,139.9844 L391.9688,142.7031 Q391.3438,142.125 390.75,141.8594 Q390.1563,141.5781 389.5313,141.5781 Q388.1875,141.5781 387.5,142.6563 Q386.8125,143.7188 386.8125,145.8125 Q386.8125,147.9063 387.5,148.9844 Q388.1875,150.0469 389.5313,150.0469 Q390.1563,150.0469 390.75,149.7813 Q391.3438,149.5 391.9688,148.9219 L391.9688,151.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="150.1543">A</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="433" y1="162" y2="162"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="375" x2="433" y1="170" y2="170"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8mmhmxnltqk)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="233" y="130"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ha6ttp2xx66)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="233" y="130"/>
       <ellipse cx="248" cy="146" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M250.9688,151.6406 Q250.3906,151.9375 249.75,152.0781 Q249.1094,152.2344 248.4063,152.2344 Q245.9063,152.2344 244.5781,150.5938 Q243.2656,148.9375 243.2656,145.8125 Q243.2656,142.6875 244.5781,141.0313 Q245.9063,139.375 248.4063,139.375 Q249.1094,139.375 249.75,139.5313 Q250.4063,139.6875 250.9688,139.9844 L250.9688,142.7031 Q250.3438,142.125 249.75,141.8594 Q249.1563,141.5781 248.5313,141.5781 Q247.1875,141.5781 246.5,142.6563 Q245.8125,143.7188 245.8125,145.8125 Q245.8125,147.9063 246.5,148.9844 Q247.1875,150.0469 248.5313,150.0469 Q249.1563,150.0469 249.75,149.7813 Q250.3438,149.5 250.9688,148.9219 L250.9688,151.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="262" y="150.1543">A</text>
@@ -46,8 +46,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="234" x2="338" y1="162" y2="162"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="234" x2="338" y1="170" y2="170"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8mmhmxnltqk)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="6" y="130"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ha6ttp2xx66)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="6" y="130"/>
       <ellipse cx="21" cy="146" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,151.6406 Q23.3906,151.9375 22.75,152.0781 Q22.1094,152.2344 21.4063,152.2344 Q18.9063,152.2344 17.5781,150.5938 Q16.2656,148.9375 16.2656,145.8125 Q16.2656,142.6875 17.5781,141.0313 Q18.9063,139.375 21.4063,139.375 Q22.1094,139.375 22.75,139.5313 Q23.4063,139.6875 23.9688,139.9844 L23.9688,142.7031 Q23.3438,142.125 22.75,141.8594 Q22.1563,141.5781 21.5313,141.5781 Q20.1875,141.5781 19.5,142.6563 Q18.8125,143.7188 18.8125,145.8125 Q18.8125,147.9063 19.5,148.9844 Q20.1875,150.0469 21.5313,150.0469 Q22.1563,150.0469 22.75,149.7813 Q23.3438,149.5 23.9688,148.9219 L23.9688,151.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="150.1543">A</text>
@@ -56,33 +56,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="197" y1="162" y2="162"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="197" y1="170" y2="170"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8mmhmxnltqk)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="157.5" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ha6ttp2xx66)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="157.5" y="255"/>
       <ellipse cx="277.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M280.7188,276.6406 Q280.1406,276.9375 279.5,277.0781 Q278.8594,277.2344 278.1563,277.2344 Q275.6563,277.2344 274.3281,275.5938 Q273.0156,273.9375 273.0156,270.8125 Q273.0156,267.6875 274.3281,266.0313 Q275.6563,264.375 278.1563,264.375 Q278.8594,264.375 279.5,264.5313 Q280.1563,264.6875 280.7188,264.9844 L280.7188,267.7031 Q280.0938,267.125 279.5,266.8594 Q278.9063,266.5781 278.2813,266.5781 Q276.9375,266.5781 276.25,267.6563 Q275.5625,268.7188 275.5625,270.8125 Q275.5625,272.9063 276.25,273.9844 Q276.9375,275.0469 278.2813,275.0469 Q278.9063,275.0469 279.5,274.7813 Q280.0938,274.5 280.7188,273.9219 L280.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="298.25" y="275.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="413.5" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="413.5" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="163.5" y="301"/>
       <ellipse cx="168.5" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="177.5" y="309.2104">aint : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="163.5" y="313.8047"/>
       <ellipse cx="168.5" cy="318.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="177.5" y="322.0151">astring : A&lt;std::string&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="163.5" y="326.6094"/>
       <ellipse cx="168.5" cy="331.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="177.5" y="334.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
     </a>
     <path d="M331.27,83.04 C347.78,98.92 365.81,116.26 379.78,129.71 " fill="none" id="C_0000412228989111660105&lt;-C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg
index 88ce66b6..67477728 100644
--- a/docs/test_cases/t00009_class_mermaid.svg
+++ b/docs/test_cases/t00009_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000412228989111660105-0" class="node default clickable">
             <rect height="79" width="85.421875" y="-39.5" x="-42.7109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.7109375" x1="-42.7109375" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7">
+        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0000001894387438043499-1" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -169,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7">
+        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001340793233843139195-2" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L7">
+        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L7">
           <g title="A" id="classId-C_0001370808797762248850-3" class="node default clickable">
             <rect height="57" width="225.71875" y="-28.5" x="-112.859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.859375" x1="-112.859375" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00009/t00009.cc#L12">
+        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00009/t00009.cc#L12">
           <g title="B" id="classId-C_0000176239714450247310-4" class="node default clickable">
             <rect height="123" width="295.59375" y="-61.5" x="-147.796875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="147.796875" x1="-147.796875" class="divider"/>
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index 7656e031..4fe3ecca 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="f105i46hffle68" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f196c50y8v26ym" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f105i46hffle68)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f196c50y8v26ym)" 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>
@@ -19,22 +19,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="542" y2="542"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="548"/>
       <ellipse cx="60.5" cy="553" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="556.2104">first : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="560.8047"/>
       <ellipse cx="60.5" cy="565.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="569.0151">second : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f105i46hffle68)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f196c50y8v26ym)" 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>
@@ -43,8 +43,8 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f105i46hffle68)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f196c50y8v26ym)" 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>
@@ -53,15 +53,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="301"/>
       <ellipse cx="17" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="309.2104">astring : A&lt;T,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f105i46hffle68)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f196c50y8v26ym)" 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>
@@ -70,19 +70,19 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f105i46hffle68)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f196c50y8v26ym)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="37.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">aintstring : B&lt;int&gt;</text>
     </a>
     <path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0001861520693741915300-&gt;C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg
index a1f50bee..187318f4 100644
--- a/docs/test_cases/t00010_class_mermaid.svg
+++ b/docs/test_cases/t00010_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0002222216618904514099-0" class="node default clickable">
             <rect height="101" width="99.953125" y="-50.5" x="-49.9765625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9765625" x1="-49.9765625" class="divider"/>
@@ -131,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L7">
+        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L7">
           <g title="A" id="classId-C_0001861520693741915300-1" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0002303611426082708583-2" class="node default clickable">
             <rect height="79" width="195.984375" y="-39.5" x="-97.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.9921875" x1="-97.9921875" class="divider"/>
@@ -174,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L13">
+        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L13">
           <g title="B" id="classId-C_0001498376939480949099-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00010/t00010.cc#L18">
+        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00010/t00010.cc#L18">
           <g title="C" id="classId-C_0001880966578968892571-4" class="node default clickable">
             <rect height="79" width="148.859375" y="-39.5" x="-74.4296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.4296875" x1="-74.4296875" class="divider"/>
diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md
index fee12b52..16344d60 100644
--- a/docs/test_cases/t00011.md
+++ b/docs/test_cases/t00011.md
@@ -113,6 +113,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -135,6 +136,7 @@ public:
             "line": 16,
             "translation_unit": "t00011.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -175,6 +177,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -197,6 +200,7 @@ public:
             "line": 28,
             "translation_unit": "t00011.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index 93149cfd..4246f65f 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="f1iqyj5f54l0av" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1sidoh4bugog5" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1iqyj5f54l0av)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sidoh4bugog5)" 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>
@@ -19,48 +19,48 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1iqyj5f54l0av)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sidoh4bugog5)" 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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="46"/>
       <ellipse cx="127" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="54.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1iqyj5f54l0av)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sidoh4bugog5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="192.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="204.8047"/>
       <ellipse cx="127" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="213.0151">m_a : A *</text>
     </a>
     <path d="M116.04,73.01 C105.09,85.59 97.85,100.6 103.5,116 C107.44,126.72 113.97,136.89 121.21,145.9 " fill="none" id="C_0001420516952857803719&lt;-C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg
index f17a0ef6..bfe72dd5 100644
--- a/docs/test_cases/t00011_class_mermaid.svg
+++ b/docs/test_cases/t00011_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L10">
+        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L10">
           <g title="D" id="classId-C_0001150639902748052276-0" class="node default clickable">
             <rect height="79" width="81.40625" y="-39.5" x="-40.703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.703125" x1="-40.703125" class="divider"/>
@@ -102,7 +102,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L14">
+        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L14">
           <g title="A" id="classId-C_0001420516952857803719-1" class="node default clickable">
             <rect height="79" width="99.9375" y="-39.5" x="-49.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -126,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00011/t00011.cc#L26">
+        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00011/t00011.cc#L26">
           <g title="B" id="classId-C_0001687427603952049829-2" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index 75cb702a..6663b0d6 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="frh8n1zds0csh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpk7fgj72t2td" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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>
@@ -19,22 +19,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="352"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="360.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="364.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="366.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="373.0151">values : std::variant&lt;Ts...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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,15 +60,15 @@
       <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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>
@@ -77,8 +77,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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>
@@ -87,8 +87,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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>
@@ -97,8 +97,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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>
@@ -107,8 +107,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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>
@@ -117,50 +117,50 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frh8n1zds0csh)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpk7fgj72t2td)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">a1 : A&lt;int,std::string,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">a2 : A&lt;int,std::string,bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">b1 : B&lt;3,2,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="100.6245">b2 : B&lt;1,1,1,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.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>
-    <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(#frh8n1zds0csh)" 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(#fpk7fgj72t2td)" 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/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg
index 9fda8811..7ac38189 100644
--- a/docs/test_cases/t00012_class_mermaid.svg
+++ b/docs/test_cases/t00012_class_mermaid.svg
@@ -174,7 +174,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11">
+        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0001773299890023132282-0" class="node default clickable">
             <rect height="101" width="206.203125" y="-50.5" x="-103.1015625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="103.1015625" x1="-103.1015625" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16">
+        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0002061171077567279746-1" class="node default clickable">
             <rect height="79" width="243.515625" y="-39.5" x="-121.7578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.7578125" x1="-121.7578125" class="divider"/>
@@ -227,7 +227,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0000627809578407650629-2" class="node default clickable">
             <rect height="79" width="234.625" y="-39.5" x="-117.3125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="117.3125" x1="-117.3125" class="divider"/>
@@ -251,7 +251,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11">
+        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000286972398942005457-3" class="node default clickable">
             <rect height="57" width="186.5625" y="-28.5" x="-93.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.28125" x1="-93.28125" class="divider"/>
@@ -270,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L11">
+        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L11">
           <g title="A" id="classId-C_0000299466181098300963-4" class="node default clickable">
             <rect height="57" width="186.546875" y="-28.5" x="-93.2734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.2734375" x1="-93.2734375" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16">
+        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000489063277971613593-5" class="node default clickable">
             <rect height="57" width="80.828125" y="-28.5" x="-40.4140625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="40.4140625" x1="-40.4140625" class="divider"/>
@@ -308,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L16">
+        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L16">
           <g title="B" id="classId-C_0000014232362483200599-6" class="node default clickable">
             <rect height="57" width="94.171875" y="-28.5" x="-47.0859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0859375" x1="-47.0859375" class="divider"/>
@@ -327,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L20">
+        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L20">
           <g title="C" id="classId-C_0001478239414632239754-7" class="node default clickable">
             <rect height="57" width="578.71875" y="-28.5" x="-289.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="289.359375" x1="-289.359375" class="divider"/>
@@ -346,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00012/t00012.cc#L24">
+        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00012/t00012.cc#L24">
           <g title="R" id="classId-C_0000559263385732885469-8" class="node default clickable">
             <rect height="167" width="569.0625" y="-83.5" x="-284.53125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="284.53125" x1="-284.53125" class="divider"/>
diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md
index 1e54e3d5..fed107e5 100644
--- a/docs/test_cases/t00013.md
+++ b/docs/test_cases/t00013.md
@@ -295,6 +295,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "print",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -322,6 +323,7 @@ private:
             "line": 30,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -575,6 +577,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "get_a",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -602,10 +605,12 @@ private:
             "line": 45,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_b",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -633,10 +638,12 @@ private:
             "line": 46,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_const_b",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -664,10 +671,12 @@ private:
             "line": 47,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_c",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -695,10 +704,12 @@ private:
             "line": 48,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_d",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -726,10 +737,12 @@ private:
             "line": 49,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_d2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -757,10 +770,12 @@ private:
             "line": 51,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_int_e",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -788,10 +803,12 @@ private:
             "line": 54,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_int_e2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -819,10 +836,12 @@ private:
             "line": 55,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_int_f",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -850,10 +869,12 @@ private:
             "line": 58,
             "translation_unit": "t00013.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "get_e<T>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -875,10 +896,19 @@ private:
               "type": "E<T>"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "T",
+              "template_parameters": []
+            }
+          ],
           "type": "T"
         },
         {
           "access": "public",
+          "display_name": "get_f<T>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -900,6 +930,14 @@ private:
               "type": "const F<T> &"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "T",
+              "template_parameters": []
+            }
+          ],
           "type": "T"
         }
       ],
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index fe798fc7..6b59d8ff 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="f1ntqy11ov85ae" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwigps3dlvqte" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="480.5" y2="480.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="486.5"/>
       <ellipse cx="172" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="494.7104">f : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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>
@@ -36,75 +36,75 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="351.5"/>
       <ellipse cx="380" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="359.7104">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="351.5"/>
       <ellipse cx="474" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="359.7104">b : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="345.5" y2="345.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="351.5"/>
       <ellipse cx="568.5" cy="356.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="359.7104">c : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="345.2104">print(R * r) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="357.8047"/>
       <ellipse cx="17" cy="362.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="366.0151">d : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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>
@@ -113,15 +113,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="480.5" y2="480.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="486.5"/>
       <ellipse cx="806.5" cy="491.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="494.7104">e : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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>
@@ -130,22 +130,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="474" y2="474"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="480"/>
       <ellipse cx="961.5" cy="485" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="488.2104">args : std::tuple&lt;Args...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="492.8047"/>
       <ellipse cx="961.5" cy="497.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="501.0151">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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>
@@ -154,8 +154,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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>
@@ -164,8 +164,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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>
@@ -174,93 +174,93 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ntqy11ov85ae)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwigps3dlvqte)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="391.5" y="54.2104">get_a(A * a) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
       <ellipse cx="382.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="391.5" y="67.0151">get_b(B &amp; b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="71.6094"/>
       <ellipse cx="382.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="391.5" y="79.8198">get_c(C c) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="84.4141"/>
       <ellipse cx="382.5" cy="89.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L47" xlink:show="new" xlink:title="get_const_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="391.5" y="92.6245">get_const_b(const B &amp; b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="97.2188"/>
       <ellipse cx="382.5" cy="102.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="391.5" y="105.4292">get_d(D &amp;&amp; d) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="110.0234"/>
       <ellipse cx="382.5" cy="115.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="391.5" y="118.2339">get_d2(D &amp;&amp; d) : int</text>
     </a>
     <ellipse cx="382.5" cy="127.8281" 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="391.5" y="131.0386">get_e&lt;T&gt;(E&lt;T&gt; e) : T</text>
     <ellipse cx="382.5" cy="140.6328" 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="168" x="391.5" y="143.8433">get_f&lt;T&gt;(const F&lt;T&gt; &amp; f) : T</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="148.4375"/>
       <ellipse cx="382.5" cy="153.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L54" xlink:show="new" xlink:title="get_int_e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="184" x="391.5" y="156.6479">get_int_e(const E&lt;int&gt; &amp; e) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="161.2422"/>
       <ellipse cx="382.5" cy="166.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L55" xlink:show="new" xlink:title="get_int_e2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="391.5" y="169.4526">get_int_e2(E&lt;int&gt; &amp; e) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="174.0469"/>
       <ellipse cx="382.5" cy="179.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L58" xlink:show="new" xlink:title="get_int_f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="391.5" y="182.2573">get_int_f(const ABCD::F&lt;int&gt; &amp; f) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="188.8516" y2="188.8516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="194.8516"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="196.8516"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="203.062">estring : E&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="207.6563"/>
       <ellipse cx="382.5" cy="212.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="215.8667">gintstring : G&lt;int,float,std::string&gt;</text>
     </a>
     <path d="M270.09,360.17 C260.11,377.41 246.14,401.53 233.84,422.78 " fill="none" id="C_0002304215469403389354-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg
index c153220f..839757e9 100644
--- a/docs/test_cases/t00013_class_mermaid.svg
+++ b/docs/test_cases/t00013_class_mermaid.svg
@@ -234,7 +234,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L7">
+        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0000952770730316239752-0" class="node default clickable">
             <rect height="79" width="110.109375" y="-39.5" x="-55.0546875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
@@ -258,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L7">
+        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L7">
           <g title="F" id="classId-C_0002304215469403389354-1" class="node default clickable">
             <rect height="57" width="119.890625" y="-28.5" x="-59.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="59.9453125" x1="-59.9453125" class="divider"/>
@@ -277,7 +277,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L14">
+        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L14">
           <g title="A" id="classId-C_0000519995486237427479-2" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -301,7 +301,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L18">
+        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L18">
           <g title="B" id="classId-C_0001177487653597650440-3" class="node default clickable">
             <rect height="79" width="63.484375" y="-39.5" x="-31.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -325,7 +325,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L22">
+        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L22">
           <g title="C" id="classId-C_0001028245818073128358-4" class="node default clickable">
             <rect height="79" width="62.578125" y="-39.5" x="-31.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="31.2890625" x1="-31.2890625" class="divider"/>
@@ -349,7 +349,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L28">
+        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L28">
           <g title="D" id="classId-C_0000409373870621931875-5" class="node default clickable">
             <rect height="101" width="140.8125" y="-50.5" x="-70.40625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.40625" x1="-70.40625" class="divider"/>
@@ -378,7 +378,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000864055993755439230-6" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -402,7 +402,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0000205927019127027617-7" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -431,7 +431,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33">
+        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0001977486318799565722-8" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -450,7 +450,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L37">
+        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L37">
           <g title="G" id="classId-C_0001526733274613822014-9" class="node default clickable">
             <rect height="57" width="187.453125" y="-28.5" x="-93.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.7265625" x1="-93.7265625" class="divider"/>
@@ -469,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L33">
+        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L33">
           <g title="E" id="classId-C_0000531523220915557686-10" class="node default clickable">
             <rect height="57" width="123.46875" y="-28.5" x="-61.734375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.734375" x1="-61.734375" class="divider"/>
@@ -488,7 +488,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00013/t00013.cc#L43">
+        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00013/t00013.cc#L43">
           <g title="R" id="classId-C_0002198686676355573844-11" class="node default clickable">
             <rect height="343" width="259.125" y="-171.5" x="-129.5625" class="outer title-state"/>
             <line y2="-141.5" y1="-141.5" x2="129.5625" x1="-129.5625" class="divider"/>
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index b64363fa..abafb6d8 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="1143px" preserveAspectRatio="none" style="width:1085px;height:1143px;" version="1.1" viewBox="0 0 1085 1143" width="1085px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1rlzbb5ekvj7k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f178h8eqamed6" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="589"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1009" y="589"/>
       <ellipse cx="1024" cy="605" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1026.9688,610.6406 Q1026.3906,610.9375 1025.75,611.0781 Q1025.1094,611.2344 1024.4063,611.2344 Q1021.9063,611.2344 1020.5781,609.5938 Q1019.2656,607.9375 1019.2656,604.8125 Q1019.2656,601.6875 1020.5781,600.0313 Q1021.9063,598.375 1024.4063,598.375 Q1025.1094,598.375 1025.75,598.5313 Q1026.4063,598.6875 1026.9688,598.9844 L1026.9688,601.7031 Q1026.3438,601.125 1025.75,600.8594 Q1025.1563,600.5781 1024.5313,600.5781 Q1023.1875,600.5781 1022.5,601.6563 Q1021.8125,602.7188 1021.8125,604.8125 Q1021.8125,606.9063 1022.5,607.9844 Q1023.1875,609.0469 1024.5313,609.0469 Q1025.1563,609.0469 1025.75,608.7813 Q1026.3438,608.5 1026.9688,607.9219 L1026.9688,610.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1038" y="609.1543">A</text>
@@ -19,37 +19,37 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="621" y2="621"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1010" x2="1070" y1="629" y2="629"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="1015" y="635"/>
       <ellipse cx="1020" cy="640" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="1029" y="643.2104">p : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="1015" y="647.8047"/>
       <ellipse cx="1020" cy="652.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="1029" y="656.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="51.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="466.5" y="51.5"/>
       <ellipse cx="521.75" cy="67.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M524.7188,73.1406 Q524.1406,73.4375 523.5,73.5781 Q522.8594,73.7344 522.1563,73.7344 Q519.6563,73.7344 518.3281,72.0938 Q517.0156,70.4375 517.0156,67.3125 Q517.0156,64.1875 518.3281,62.5313 Q519.6563,60.875 522.1563,60.875 Q522.8594,60.875 523.5,61.0313 Q524.1563,61.1875 524.7188,61.4844 L524.7188,64.2031 Q524.0938,63.625 523.5,63.3594 Q522.9063,63.0781 522.2813,63.0781 Q520.9375,63.0781 520.25,64.1563 Q519.5625,65.2188 519.5625,67.3125 Q519.5625,69.4063 520.25,70.4844 Q520.9375,71.5469 522.2813,71.5469 Q522.9063,71.5469 523.5,71.2813 Q524.0938,71 524.7188,70.4219 L524.7188,73.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.25" y="71.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="83.5" y2="83.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="467.5" x2="592.5" y1="91.5" y2="91.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="472.5" y="97.5"/>
       <ellipse cx="477.5" cy="102.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="486.5" y="105.7104">value : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="870"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="774" y="870"/>
       <ellipse cx="789" cy="886" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M791.9688,891.6406 Q791.3906,891.9375 790.75,892.0781 Q790.1094,892.2344 789.4063,892.2344 Q786.9063,892.2344 785.5781,890.5938 Q784.2656,888.9375 784.2656,885.8125 Q784.2656,882.6875 785.5781,881.0313 Q786.9063,879.375 789.4063,879.375 Q790.1094,879.375 790.75,879.5313 Q791.4063,879.6875 791.9688,879.9844 L791.9688,882.7031 Q791.3438,882.125 790.75,881.8594 Q790.1563,881.5781 789.5313,881.5781 Q788.1875,881.5781 787.5,882.6563 Q786.8125,883.7188 786.8125,885.8125 Q786.8125,887.9063 787.5,888.9844 Q788.1875,890.0469 789.5313,890.0469 Q790.1563,890.0469 790.75,889.7813 Q791.3438,889.5 791.9688,888.9219 L791.9688,891.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="803" y="890.1543">A</text>
@@ -58,8 +58,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="902" y2="902"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="775" x2="890" y1="910" y2="910"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="653"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="717" y="653"/>
       <ellipse cx="732" cy="669" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M734.9688,674.6406 Q734.3906,674.9375 733.75,675.0781 Q733.1094,675.2344 732.4063,675.2344 Q729.9063,675.2344 728.5781,673.5938 Q727.2656,671.9375 727.2656,668.8125 Q727.2656,665.6875 728.5781,664.0313 Q729.9063,662.375 732.4063,662.375 Q733.1094,662.375 733.75,662.5313 Q734.4063,662.6875 734.9688,662.9844 L734.9688,665.7031 Q734.3438,665.125 733.75,664.8594 Q733.1563,664.5781 732.5313,664.5781 Q731.1875,664.5781 730.5,665.6563 Q729.8125,666.7188 729.8125,668.8125 Q729.8125,670.9063 730.5,671.9844 Q731.1875,673.0469 732.5313,673.0469 Q733.1563,673.0469 733.75,672.7813 Q734.3438,672.5 734.9688,671.9219 L734.9688,674.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="746" y="673.1543">A</text>
@@ -68,8 +68,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="685" y2="685"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="718" x2="947" y1="693" y2="693"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="529"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="791.5" y="529"/>
       <ellipse cx="806.5" cy="545" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M809.4688,550.6406 Q808.8906,550.9375 808.25,551.0781 Q807.6094,551.2344 806.9063,551.2344 Q804.4063,551.2344 803.0781,549.5938 Q801.7656,547.9375 801.7656,544.8125 Q801.7656,541.6875 803.0781,540.0313 Q804.4063,538.375 806.9063,538.375 Q807.6094,538.375 808.25,538.5313 Q808.9063,538.6875 809.4688,538.9844 L809.4688,541.7031 Q808.8438,541.125 808.25,540.8594 Q807.6563,540.5781 807.0313,540.5781 Q805.6875,540.5781 805,541.6563 Q804.3125,542.7188 804.3125,544.8125 Q804.3125,546.9063 805,547.9844 Q805.6875,549.0469 807.0313,549.0469 Q807.6563,549.0469 808.25,548.7813 Q808.8438,548.5 809.4688,547.9219 L809.4688,550.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="549.1543">A</text>
@@ -78,8 +78,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="561" y2="561"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="872.5" y1="569" y2="569"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="295"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="783.5" y="295"/>
       <ellipse cx="798.5" cy="311" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M801.4688,316.6406 Q800.8906,316.9375 800.25,317.0781 Q799.6094,317.2344 798.9063,317.2344 Q796.4063,317.2344 795.0781,315.5938 Q793.7656,313.9375 793.7656,310.8125 Q793.7656,307.6875 795.0781,306.0313 Q796.4063,304.375 798.9063,304.375 Q799.6094,304.375 800.25,304.5313 Q800.9063,304.6875 801.4688,304.9844 L801.4688,307.7031 Q800.8438,307.125 800.25,306.8594 Q799.6563,306.5781 799.0313,306.5781 Q797.6875,306.5781 797,307.6563 Q796.3125,308.7188 796.3125,310.8125 Q796.3125,312.9063 797,313.9844 Q797.6875,315.0469 799.0313,315.0469 Q799.6563,315.0469 800.25,314.7813 Q800.8438,314.5 801.4688,313.9219 L801.4688,316.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.5" y="315.1543">A</text>
@@ -88,8 +88,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="327" y2="327"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="880.5" y1="335" y2="335"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="585"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="488" y="585"/>
       <ellipse cx="503" cy="601" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M505.9688,606.6406 Q505.3906,606.9375 504.75,607.0781 Q504.1094,607.2344 503.4063,607.2344 Q500.9063,607.2344 499.5781,605.5938 Q498.2656,603.9375 498.2656,600.8125 Q498.2656,597.6875 499.5781,596.0313 Q500.9063,594.375 503.4063,594.375 Q504.1094,594.375 504.75,594.5313 Q505.4063,594.6875 505.9688,594.9844 L505.9688,597.7031 Q505.3438,597.125 504.75,596.8594 Q504.1563,596.5781 503.5313,596.5781 Q502.1875,596.5781 501.5,597.6563 Q500.8125,598.7188 500.8125,600.8125 Q500.8125,602.9063 501.5,603.9844 Q502.1875,605.0469 503.5313,605.0469 Q504.1563,605.0469 504.75,604.7813 Q505.3438,604.5 505.9688,603.9219 L505.9688,606.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="517" y="605.1543">A</text>
@@ -98,8 +98,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="617" y2="617"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489" x2="571" y1="625" y2="625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="502"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="479" y="502"/>
       <ellipse cx="494" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M496.9688,523.6406 Q496.3906,523.9375 495.75,524.0781 Q495.1094,524.2344 494.4063,524.2344 Q491.9063,524.2344 490.5781,522.5938 Q489.2656,520.9375 489.2656,517.8125 Q489.2656,514.6875 490.5781,513.0313 Q491.9063,511.375 494.4063,511.375 Q495.1094,511.375 495.75,511.5313 Q496.4063,511.6875 496.9688,511.9844 L496.9688,514.7031 Q496.3438,514.125 495.75,513.8594 Q495.1563,513.5781 494.5313,513.5781 Q493.1875,513.5781 492.5,514.6563 Q491.8125,515.7188 491.8125,517.8125 Q491.8125,519.9063 492.5,520.9844 Q493.1875,522.0469 494.5313,522.0469 Q495.1563,522.0469 495.75,521.7813 Q496.3438,521.5 496.9688,520.9219 L496.9688,523.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508" y="522.1543">A</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="534" y2="534"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="480" x2="580" y1="542" y2="542"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="253"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="471" y="253"/>
       <ellipse cx="486" cy="269" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M488.9688,274.6406 Q488.3906,274.9375 487.75,275.0781 Q487.1094,275.2344 486.4063,275.2344 Q483.9063,275.2344 482.5781,273.5938 Q481.2656,271.9375 481.2656,268.8125 Q481.2656,265.6875 482.5781,264.0313 Q483.9063,262.375 486.4063,262.375 Q487.1094,262.375 487.75,262.5313 Q488.4063,262.6875 488.9688,262.9844 L488.9688,265.7031 Q488.3438,265.125 487.75,264.8594 Q487.1563,264.5781 486.5313,264.5781 Q485.1875,264.5781 484.5,265.6563 Q483.8125,266.7188 483.8125,268.8125 Q483.8125,270.9063 484.5,271.9844 Q485.1875,273.0469 486.5313,273.0469 Q487.1563,273.0469 487.75,272.7813 Q488.3438,272.5 488.9688,271.9219 L488.9688,274.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="500" y="273.1543">A</text>
@@ -118,8 +118,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="285" y2="285"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="588" y1="293" y2="293"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="478.5" y="419"/>
       <ellipse cx="493.5" cy="435" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M496.4688,440.6406 Q495.8906,440.9375 495.25,441.0781 Q494.6094,441.2344 493.9063,441.2344 Q491.4063,441.2344 490.0781,439.5938 Q488.7656,437.9375 488.7656,434.8125 Q488.7656,431.6875 490.0781,430.0313 Q491.4063,428.375 493.9063,428.375 Q494.6094,428.375 495.25,428.5313 Q495.9063,428.6875 496.4688,428.9844 L496.4688,431.7031 Q495.8438,431.125 495.25,430.8594 Q494.6563,430.5781 494.0313,430.5781 Q492.6875,430.5781 492,431.6563 Q491.3125,432.7188 491.3125,434.8125 Q491.3125,436.9063 492,437.9844 Q492.6875,439.0469 494.0313,439.0469 Q494.6563,439.0469 495.25,438.7813 Q495.8438,438.5 496.4688,437.9219 L496.4688,440.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="507.5" y="439.1543">A</text>
@@ -128,8 +128,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="451" y2="451"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="479.5" x2="580.5" y1="459" y2="459"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="336"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="470.5" y="336"/>
       <ellipse cx="485.5" cy="352" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M488.4688,357.6406 Q487.8906,357.9375 487.25,358.0781 Q486.6094,358.2344 485.9063,358.2344 Q483.4063,358.2344 482.0781,356.5938 Q480.7656,354.9375 480.7656,351.8125 Q480.7656,348.6875 482.0781,347.0313 Q483.4063,345.375 485.9063,345.375 Q486.6094,345.375 487.25,345.5313 Q487.9063,345.6875 488.4688,345.9844 L488.4688,348.7031 Q487.8438,348.125 487.25,347.8594 Q486.6563,347.5781 486.0313,347.5781 Q484.6875,347.5781 484,348.6563 Q483.3125,349.7188 483.3125,351.8125 Q483.3125,353.9063 484,354.9844 Q484.6875,356.0469 486.0313,356.0469 Q486.6563,356.0469 487.25,355.7813 Q487.8438,355.5 488.4688,354.9219 L488.4688,357.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="499.5" y="356.1543">A</text>
@@ -138,8 +138,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="368" y2="368"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="471.5" x2="588.5" y1="376" y2="376"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="751"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="461.5" y="751"/>
       <ellipse cx="476.5" cy="767" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M479.4688,772.6406 Q478.8906,772.9375 478.25,773.0781 Q477.6094,773.2344 476.9063,773.2344 Q474.4063,773.2344 473.0781,771.5938 Q471.7656,769.9375 471.7656,766.8125 Q471.7656,763.6875 473.0781,762.0313 Q474.4063,760.375 476.9063,760.375 Q477.6094,760.375 478.25,760.5313 Q478.9063,760.6875 479.4688,760.9844 L479.4688,763.7031 Q478.8438,763.125 478.25,762.8594 Q477.6563,762.5781 477.0313,762.5781 Q475.6875,762.5781 475,763.6563 Q474.3125,764.7188 474.3125,766.8125 Q474.3125,768.9063 475,769.9844 Q475.6875,771.0469 477.0313,771.0469 Q477.6563,771.0469 478.25,770.7813 Q478.8438,770.5 479.4688,769.9219 L479.4688,772.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490.5" y="771.1543">A</text>
@@ -148,8 +148,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="783" y2="783"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="462.5" x2="597.5" y1="791" y2="791"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="668"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="404" y="668"/>
       <ellipse cx="419" cy="684" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M421.9688,689.6406 Q421.3906,689.9375 420.75,690.0781 Q420.1094,690.2344 419.4063,690.2344 Q416.9063,690.2344 415.5781,688.5938 Q414.2656,686.9375 414.2656,683.8125 Q414.2656,680.6875 415.5781,679.0313 Q416.9063,677.375 419.4063,677.375 Q420.1094,677.375 420.75,677.5313 Q421.4063,677.6875 421.9688,677.9844 L421.9688,680.7031 Q421.3438,680.125 420.75,679.8594 Q420.1563,679.5781 419.5313,679.5781 Q418.1875,679.5781 417.5,680.6563 Q416.8125,681.7188 416.8125,683.8125 Q416.8125,685.9063 417.5,686.9844 Q418.1875,688.0469 419.5313,688.0469 Q420.1563,688.0469 420.75,687.7813 Q421.3438,687.5 421.9688,686.9219 L421.9688,689.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="433" y="688.1543">A</text>
@@ -158,8 +158,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="700" y2="700"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="655" y1="708" y2="708"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="917"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="467" y="917"/>
       <ellipse cx="482" cy="933" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M484.9688,938.6406 Q484.3906,938.9375 483.75,939.0781 Q483.1094,939.2344 482.4063,939.2344 Q479.9063,939.2344 478.5781,937.5938 Q477.2656,935.9375 477.2656,932.8125 Q477.2656,929.6875 478.5781,928.0313 Q479.9063,926.375 482.4063,926.375 Q483.1094,926.375 483.75,926.5313 Q484.4063,926.6875 484.9688,926.9844 L484.9688,929.7031 Q484.3438,929.125 483.75,928.8594 Q483.1563,928.5781 482.5313,928.5781 Q481.1875,928.5781 480.5,929.6563 Q479.8125,930.7188 479.8125,932.8125 Q479.8125,934.9063 480.5,935.9844 Q481.1875,937.0469 482.5313,937.0469 Q483.1563,937.0469 483.75,936.7813 Q484.3438,936.5 484.9688,935.9219 L484.9688,938.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="496" y="937.1543">A</text>
@@ -168,8 +168,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="949" y2="949"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="592" y1="957" y2="957"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1000"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="444" y="1000"/>
       <ellipse cx="459" cy="1016" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M461.9688,1021.6406 Q461.3906,1021.9375 460.75,1022.0781 Q460.1094,1022.2344 459.4063,1022.2344 Q456.9063,1022.2344 455.5781,1020.5938 Q454.2656,1018.9375 454.2656,1015.8125 Q454.2656,1012.6875 455.5781,1011.0313 Q456.9063,1009.375 459.4063,1009.375 Q460.1094,1009.375 460.75,1009.5313 Q461.4063,1009.6875 461.9688,1009.9844 L461.9688,1012.7031 Q461.3438,1012.125 460.75,1011.8594 Q460.1563,1011.5781 459.5313,1011.5781 Q458.1875,1011.5781 457.5,1012.6563 Q456.8125,1013.7188 456.8125,1015.8125 Q456.8125,1017.9063 457.5,1018.9844 Q458.1875,1020.0469 459.5313,1020.0469 Q460.1563,1020.0469 460.75,1019.7813 Q461.3438,1019.5 461.9688,1018.9219 L461.9688,1021.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="473" y="1020.1543">A</text>
@@ -178,7 +178,7 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1032" y2="1032"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="445" x2="615" y1="1040" y2="1040"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1083"/>
+    <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1083"/>
     <ellipse cx="476" cy="1099" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M478.9688,1104.6406 Q478.3906,1104.9375 477.75,1105.0781 Q477.1094,1105.2344 476.4063,1105.2344 Q473.9063,1105.2344 472.5781,1103.5938 Q471.2656,1101.9375 471.2656,1098.8125 Q471.2656,1095.6875 472.5781,1094.0313 Q473.9063,1092.375 476.4063,1092.375 Q477.1094,1092.375 477.75,1092.5313 Q478.4063,1092.6875 478.9688,1092.9844 L478.9688,1095.7031 Q478.3438,1095.125 477.75,1094.8594 Q477.1563,1094.5781 476.5313,1094.5781 Q475.1875,1094.5781 474.5,1095.6563 Q473.8125,1096.7188 473.8125,1098.8125 Q473.8125,1100.9063 474.5,1101.9844 Q475.1875,1103.0469 476.5313,1103.0469 Q477.1563,1103.0469 477.75,1102.7813 Q478.3438,1102.5 478.9688,1101.9219 L478.9688,1104.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="490" y="1103.1543">A</text>
@@ -186,7 +186,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="94" x="507" y="1092.1387">char,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1115" y2="1115"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="462" x2="598" y1="1123" y2="1123"/>
-    <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="834"/>
+    <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="834"/>
     <ellipse cx="465.5" cy="850" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M468.4688,855.6406 Q467.8906,855.9375 467.25,856.0781 Q466.6094,856.2344 465.9063,856.2344 Q463.4063,856.2344 462.0781,854.5938 Q460.7656,852.9375 460.7656,849.8125 Q460.7656,846.6875 462.0781,845.0313 Q463.4063,843.375 465.9063,843.375 Q466.6094,843.375 467.25,843.5313 Q467.9063,843.6875 468.4688,843.9844 L468.4688,846.7031 Q467.8438,846.125 467.25,845.8594 Q466.6563,845.5781 466.0313,845.5781 Q464.6875,845.5781 464,846.6563 Q463.3125,847.7188 463.3125,849.8125 Q463.3125,851.9063 464,852.9844 Q464.6875,854.0469 466.0313,854.0469 Q466.6563,854.0469 467.25,853.7813 Q467.8438,853.5 468.4688,852.9219 L468.4688,855.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479.5" y="854.1543">A</text>
@@ -194,8 +194,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="115" x="496.5" y="843.1387">wchar_t,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="866" y2="866"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451.5" x2="608.5" y1="874" y2="874"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rlzbb5ekvj7k)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="407.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f178h8eqamed6)" height="252.875" id="C_0001758213171584933144" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="6" y="407.5"/>
       <ellipse cx="114.25" cy="423.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.2188,429.1406 Q116.6406,429.4375 116,429.5781 Q115.3594,429.7344 114.6563,429.7344 Q112.1563,429.7344 110.8281,428.0938 Q109.5156,426.4375 109.5156,423.3125 Q109.5156,420.1875 110.8281,418.5313 Q112.1563,416.875 114.6563,416.875 Q115.3594,416.875 116,417.0313 Q116.6563,417.1875 117.2188,417.4844 L117.2188,420.2031 Q116.5938,419.625 116,419.3594 Q115.4063,419.0781 114.7813,419.0781 Q113.4375,419.0781 112.75,420.1563 Q112.0625,421.2188 112.0625,423.3125 Q112.0625,425.4063 112.75,426.4844 Q113.4375,427.5469 114.7813,427.5469 Q115.4063,427.5469 116,427.2813 Q116.5938,427 117.2188,426.4219 L117.2188,429.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="134.75" y="427.6543">R</text>
@@ -204,116 +204,116 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="439.5" y2="439.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="249" y1="447.5" y2="447.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L61" 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="453.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="455.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L61" 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="461.7104">abool : APtr&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L62" 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="466.3047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="468.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L62" 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="474.5151">aboolfloat : AAPtr&lt;bool,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L63" 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="479.1094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="481.1094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L63" 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="487.3198">afloat : ASharedPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="491.9141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="493.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="132" x="26" y="500.1245">atfloat : AAPtr&lt;T,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L59" 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="504.7188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="506.7188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L59" 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="512.9292">bapair : PairPairBA&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L64" 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="517.5234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="519.5234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L64" 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="525.7339">boolstring : A&lt;bool,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L72" 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="530.3281"/>
       <polygon fill="none" points="17,530.3281,21,534.3281,17,538.3281,13,534.3281" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L72" 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="538.5386">bs : BVector</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L75" 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="543.1328"/>
       <ellipse cx="17" cy="548.1328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L75" 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="551.3433">bs2 : BVector2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L68" 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="555.9375"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="557.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L68" 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="564.1479">bstringstring : BStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L76" 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="568.7422"/>
       <ellipse cx="17" cy="573.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L76" 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="576.9526">cb : SimpleCallback&lt;ACharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L65" 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="581.5469"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="583.5469"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L65" 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="589.7573">floatstring : AStringPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L77" 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="594.3516"/>
       <ellipse cx="17" cy="599.3516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="26" y="602.562">gcb : GenericCallback&lt;AWCharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L66" 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="607.1563"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="609.1563"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L66" 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="615.3667">intstring : AIntString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L67" 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="619.9609"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="621.9609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L67" 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="628.1714">stringstring : AStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L78" 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="632.7656"/>
       <ellipse cx="17" cy="637.7656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L78" 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="640.9761">vcb : VoidCallback</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L79" 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="645.5703"/>
       <ellipse cx="17" cy="650.5703" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L79" 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="653.7808">vps : VectorPtr&lt;B&gt;</text>
     </a>
     <path d="M852.1,869.74 C884.92,826.94 953.84,737.07 998.19,679.23 " fill="none" id="C_0002186387853087008570-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00014_class_mermaid.svg b/docs/test_cases/t00014_class_mermaid.svg
index 41abfb4e..229d38f3 100644
--- a/docs/test_cases/t00014_class_mermaid.svg
+++ b/docs/test_cases/t00014_class_mermaid.svg
@@ -474,7 +474,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L21">
+        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000765890579167335652-0" class="node default clickable">
             <rect height="101" width="68.359375" y="-50.5" x="-34.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.1796875" x1="-34.1796875" class="divider"/>
@@ -503,7 +503,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L26">
+        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L26">
           <g title="B" id="classId-C_0000934136012292043506-1" class="node default clickable">
             <rect height="79" width="145.296875" y="-39.5" x="-72.6484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.6484375" x1="-72.6484375" class="divider"/>
@@ -527,7 +527,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30">
+        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0002186387853087008570-2" class="node default clickable">
             <rect height="57" width="136.796875" y="-28.5" x="-68.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -546,7 +546,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L31">
+        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0000947292733740993297-3" class="node default clickable">
             <rect height="57" width="272.796875" y="-28.5" x="-136.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="136.3984375" x1="-136.3984375" class="divider"/>
@@ -565,7 +565,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L34">
+        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0001700006390494465667-4" class="node default clickable">
             <rect height="57" width="93.234375" y="-28.5" x="-46.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="46.6171875" x1="-46.6171875" class="divider"/>
@@ -584,7 +584,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L37">
+        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002017665567517853203-5" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
@@ -603,7 +603,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000906557320263235873-6" class="node default clickable">
             <rect height="57" width="95.015625" y="-28.5" x="-47.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.5078125" x1="-47.5078125" class="divider"/>
@@ -622,7 +622,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L34">
+        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L34">
           <g title="A" id="classId-C_0000378898020828430636-7" class="node default clickable">
             <rect height="57" width="117.21875" y="-28.5" x="-58.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.609375" x1="-58.609375" class="divider"/>
@@ -641,7 +641,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L37">
+        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L37">
           <g title="A" id="classId-C_0002082013375525130414-8" class="node default clickable">
             <rect height="57" width="135.890625" y="-28.5" x="-67.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.9453125" x1="-67.9453125" class="divider"/>
@@ -660,7 +660,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L41">
+        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L41">
           <g title="A" id="classId-C_0000051978493292659230-9" class="node default clickable">
             <rect height="57" width="117.234375" y="-28.5" x="-58.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -679,7 +679,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L38">
+        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L38">
           <g title="A" id="classId-C_0000197769253782961588-10" class="node default clickable">
             <rect height="57" width="135.90625" y="-28.5" x="-67.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.953125" x1="-67.953125" class="divider"/>
@@ -698,7 +698,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L21">
+        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L21">
           <g title="A" id="classId-C_0000895940711566401184-11" class="node default clickable">
             <rect height="57" width="162.5625" y="-28.5" x="-81.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.28125" x1="-81.28125" class="divider"/>
@@ -717,7 +717,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L31">
+        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L31">
           <g title="A" id="classId-C_0001751732625010742161-12" class="node default clickable">
             <rect height="57" width="298.578125" y="-28.5" x="-149.2890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.2890625" x1="-149.2890625" class="divider"/>
@@ -736,7 +736,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0000887121441210847583-13" class="node default clickable">
             <rect height="57" width="148.34375" y="-28.5" x="-74.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.171875" x1="-74.171875" class="divider"/>
@@ -755,7 +755,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L30">
+        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L30">
           <g title="A" id="classId-C_0001119452495635561975-14" class="node default clickable">
             <rect height="57" width="207.890625" y="-28.5" x="-103.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="103.9453125" x1="-103.9453125" class="divider"/>
@@ -774,7 +774,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L111">
+        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L111">
           <g title="A" id="classId-C_0000340562099063642390-15" class="node default clickable">
             <rect height="57" width="161.703125" y="-28.5" x="-80.8515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="80.8515625" x1="-80.8515625" class="divider"/>
@@ -793,7 +793,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L111">
+        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L111">
           <g title="A" id="classId-C_0001388877149159894665-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -812,7 +812,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00014/t00014.cc#L56">
+        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00014/t00014.cc#L56">
           <g title="R" id="classId-C_0001758213171584933144-17" class="node default clickable">
             <rect height="409" width="301.203125" y="-204.5" x="-150.6015625" class="outer title-state"/>
             <line y2="-174.5" y1="-174.5" x2="150.6015625" x1="-150.6015625" class="divider"/>
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index 2103ce95..4e66daa8 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="fflnwnbm8ru6e" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fng91fpvsd660" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fflnwnbm8ru6e)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fng91fpvsd660)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fflnwnbm8ru6e)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fng91fpvsd660)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fflnwnbm8ru6e)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fng91fpvsd660)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fflnwnbm8ru6e)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fng91fpvsd660)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fflnwnbm8ru6e)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fng91fpvsd660)" 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/t00015_class_mermaid.svg b/docs/test_cases/t00015_class_mermaid.svg
index 00baedca..fbb2e254 100644
--- a/docs/test_cases/t00015_class_mermaid.svg
+++ b/docs/test_cases/t00015_class_mermaid.svg
@@ -84,7 +84,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L6">
+        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L6">
           <g title="A" id="classId-C_0001410694888805149453-0" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -103,7 +103,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L10">
+        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L10">
           <g title="A" id="classId-C_0000485552648049088863-1" class="node default clickable">
             <rect height="57" width="165.296875" y="-28.5" x="-82.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.6484375" x1="-82.6484375" class="divider"/>
@@ -122,7 +122,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L14">
+        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L14">
           <g title="Anon" id="classId-C_0001060731132374575329-2" class="node default clickable">
             <rect height="57" width="94.109375" y="-28.5" x="-47.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="47.0546875" x1="-47.0546875" class="divider"/>
@@ -141,7 +141,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L21">
+        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L21">
           <g title="Anon" id="classId-C_0001797521288354158629-3" class="node default clickable">
             <rect height="57" width="170.5625" y="-28.5" x="-85.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.28125" x1="-85.28125" class="divider"/>
@@ -160,7 +160,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00015/t00015.cc#L24">
+        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00015/t00015.cc#L24">
           <g title="B" id="classId-C_0000870882387819356092-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index 32999327..ae21d7cb 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="200px" preserveAspectRatio="none" style="width:847px;height:200px;" version="1.1" viewBox="0 0 847 200" width="847px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fmffu1aa9nv1f" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ctanix6ded2b" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmffu1aa9nv1f)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ctanix6ded2b)" height="60.8047" id="C_0000932856332558460389" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="343.5" y="8"/>
       <ellipse cx="358.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.4688,29.6406 Q360.8906,29.9375 360.25,30.0781 Q359.6094,30.2344 358.9063,30.2344 Q356.4063,30.2344 355.0781,28.5938 Q353.7656,26.9375 353.7656,23.8125 Q353.7656,20.6875 355.0781,19.0313 Q356.4063,17.375 358.9063,17.375 Q359.6094,17.375 360.25,17.5313 Q360.9063,17.6875 361.4688,17.9844 L361.4688,20.7031 Q360.8438,20.125 360.25,19.8594 Q359.6563,19.5781 359.0313,19.5781 Q357.6875,19.5781 357,20.6563 Q356.3125,21.7188 356.3125,23.8125 Q356.3125,25.9063 357,26.9844 Q357.6875,28.0469 359.0313,28.0469 Q359.6563,28.0469 360.25,27.7813 Q360.8438,27.5 361.4688,26.9219 L361.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="372.5" y="28.1543">is_numeric</text>
@@ -21,8 +21,8 @@
       <ellipse cx="354.5" cy="59" fill="none" 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="363.5" y="62.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmffu1aa9nv1f)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ctanix6ded2b)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="129"/>
       <ellipse cx="21" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,150.6406 Q23.3906,150.9375 22.75,151.0781 Q22.1094,151.2344 21.4063,151.2344 Q18.9063,151.2344 17.5781,149.5938 Q16.2656,147.9375 16.2656,144.8125 Q16.2656,141.6875 17.5781,140.0313 Q18.9063,138.375 21.4063,138.375 Q22.1094,138.375 22.75,138.5313 Q23.4063,138.6875 23.9688,138.9844 L23.9688,141.7031 Q23.3438,141.125 22.75,140.8594 Q22.1563,140.5781 21.5313,140.5781 Q20.1875,140.5781 19.5,141.6563 Q18.8125,142.7188 18.8125,144.8125 Q18.8125,146.9063 19.5,147.9844 Q20.1875,149.0469 21.5313,149.0469 Q22.1563,149.0469 22.75,148.7813 Q23.3438,148.5 23.9688,147.9219 L23.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="149.1543">is_numeric</text>
@@ -33,8 +33,8 @@
       <ellipse cx="17" cy="180" fill="none" 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="26" y="183.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmffu1aa9nv1f)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ctanix6ded2b)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="129"/>
       <ellipse cx="186" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.9688,150.6406 Q188.3906,150.9375 187.75,151.0781 Q187.1094,151.2344 186.4063,151.2344 Q183.9063,151.2344 182.5781,149.5938 Q181.2656,147.9375 181.2656,144.8125 Q181.2656,141.6875 182.5781,140.0313 Q183.9063,138.375 186.4063,138.375 Q187.1094,138.375 187.75,138.5313 Q188.4063,138.6875 188.9688,138.9844 L188.9688,141.7031 Q188.3438,141.125 187.75,140.8594 Q187.1563,140.5781 186.5313,140.5781 Q185.1875,140.5781 184.5,141.6563 Q183.8125,142.7188 183.8125,144.8125 Q183.8125,146.9063 184.5,147.9844 Q185.1875,149.0469 186.5313,149.0469 Q187.1563,149.0469 187.75,148.7813 Q188.3438,148.5 188.9688,147.9219 L188.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="149.1543">is_numeric</text>
@@ -45,8 +45,8 @@
       <ellipse cx="182" cy="180" fill="none" 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="191" y="183.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmffu1aa9nv1f)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ctanix6ded2b)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="129"/>
       <ellipse cx="351.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,150.6406 Q353.8906,150.9375 353.25,151.0781 Q352.6094,151.2344 351.9063,151.2344 Q349.4063,151.2344 348.0781,149.5938 Q346.7656,147.9375 346.7656,144.8125 Q346.7656,141.6875 348.0781,140.0313 Q349.4063,138.375 351.9063,138.375 Q352.6094,138.375 353.25,138.5313 Q353.9063,138.6875 354.4688,138.9844 L354.4688,141.7031 Q353.8438,141.125 353.25,140.8594 Q352.6563,140.5781 352.0313,140.5781 Q350.6875,140.5781 350,141.6563 Q349.3125,142.7188 349.3125,144.8125 Q349.3125,146.9063 350,147.9844 Q350.6875,149.0469 352.0313,149.0469 Q352.6563,149.0469 353.25,148.7813 Q353.8438,148.5 354.4688,147.9219 L354.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="149.1543">is_numeric</text>
@@ -57,8 +57,8 @@
       <ellipse cx="347.5" cy="180" fill="none" 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="356.5" y="183.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmffu1aa9nv1f)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ctanix6ded2b)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="129"/>
       <ellipse cx="566" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M568.9688,150.6406 Q568.3906,150.9375 567.75,151.0781 Q567.1094,151.2344 566.4063,151.2344 Q563.9063,151.2344 562.5781,149.5938 Q561.2656,147.9375 561.2656,144.8125 Q561.2656,141.6875 562.5781,140.0313 Q563.9063,138.375 566.4063,138.375 Q567.1094,138.375 567.75,138.5313 Q568.4063,138.6875 568.9688,138.9844 L568.9688,141.7031 Q568.3438,141.125 567.75,140.8594 Q567.1563,140.5781 566.5313,140.5781 Q565.1875,140.5781 564.5,141.6563 Q563.8125,142.7188 563.8125,144.8125 Q563.8125,146.9063 564.5,147.9844 Q565.1875,149.0469 566.5313,149.0469 Q567.1563,149.0469 567.75,148.7813 Q568.3438,148.5 568.9688,147.9219 L568.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="149.1543">is_numeric</text>
@@ -69,8 +69,8 @@
       <ellipse cx="562" cy="180" fill="none" 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="571" y="183.2104">value : enum</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmffu1aa9nv1f)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ctanix6ded2b)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="129"/>
       <ellipse cx="719.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M722.4688,150.6406 Q721.8906,150.9375 721.25,151.0781 Q720.6094,151.2344 719.9063,151.2344 Q717.4063,151.2344 716.0781,149.5938 Q714.7656,147.9375 714.7656,144.8125 Q714.7656,141.6875 716.0781,140.0313 Q717.4063,138.375 719.9063,138.375 Q720.6094,138.375 721.25,138.5313 Q721.9063,138.6875 722.4688,138.9844 L722.4688,141.7031 Q721.8438,141.125 721.25,140.8594 Q720.6563,140.5781 720.0313,140.5781 Q718.6875,140.5781 718,141.6563 Q717.3125,142.7188 717.3125,144.8125 Q717.3125,146.9063 718,147.9844 Q718.6875,149.0469 720.0313,149.0469 Q720.6563,149.0469 721.25,148.7813 Q721.8438,148.5 722.4688,147.9219 L722.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="149.1543">is_numeric</text>
diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg
index 66799b77..1e8614a0 100644
--- a/docs/test_cases/t00016_class_mermaid.svg
+++ b/docs/test_cases/t00016_class_mermaid.svg
@@ -114,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L4">
+        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L4">
           <g title="is_numeric" id="classId-C_0000932856332558460389-0" class="node default clickable">
             <rect height="79" width="192.875" y="-39.5" x="-96.4375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="96.4375" x1="-96.4375" class="divider"/>
@@ -138,7 +138,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L8">
+        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L8">
           <g title="is_numeric" id="classId-C_0000095618295648274199-1" class="node default clickable">
             <rect height="79" width="151.953125" y="-39.5" x="-75.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.9765625" x1="-75.9765625" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L12">
+        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L12">
           <g title="is_numeric" id="classId-C_0000979129381790761728-2" class="node default clickable">
             <rect height="79" width="151.96875" y="-39.5" x="-75.984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.984375" x1="-75.984375" class="divider"/>
@@ -186,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L16">
+        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L16">
           <g title="is_numeric" id="classId-C_0002090787690027341836-3" class="node default clickable">
             <rect height="79" width="213.28125" y="-39.5" x="-106.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="106.640625" x1="-106.640625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L20">
+        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L20">
           <g title="is_numeric" id="classId-C_0000500603075237446075-4" class="node default clickable">
             <rect height="79" width="137.71875" y="-39.5" x="-68.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.859375" x1="-68.859375" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00016/t00016.cc#L24">
+        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00016/t00016.cc#L24">
           <g title="is_numeric" id="classId-C_0002111316837513419920-5" class="node default clickable">
             <rect height="79" width="151.9375" y="-39.5" x="-75.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.96875" x1="-75.96875" class="divider"/>
diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md
index ca028a62..8b71b728 100644
--- a/docs/test_cases/t00017.md
+++ b/docs/test_cases/t00017.md
@@ -518,6 +518,7 @@ private:
       "methods": [
         {
           "access": "private",
+          "display_name": "R",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -561,6 +562,7 @@ private:
             "line": 28,
             "translation_unit": "t00017.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 531fe9ab..047b37bc 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="foreu7whp5q8x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ft5w8azjot1bn" 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,135 +9,135 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#foreu7whp5q8x)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ft5w8azjot1bn)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="213.5" 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="214.5" x2="591.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="219.5" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="353" x="233.5" y="54.2104">R(int &amp; some_int, C &amp; cc, const E &amp; ee, F &amp;&amp; ff, I *&amp; ii) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="214.5" x2="591.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="219.5" y="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="233.5" y="75.0151">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="219.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="233.5" y="87.8198">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="219.5" y="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="233.5" y="100.6245">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="219.5" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="221.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="233.5" y="113.4292">some_int_reference : int &amp;</text>
     </a>
     <path d="M227.33,124.78 C173.51,145.32 114.85,170.01 63,197 C57.36,199.93 51.44,203.42 46.03,206.78 " fill="none" id="C_0000287495916564113342&lt;-C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg
index e75aef19..b27d4333 100644
--- a/docs/test_cases/t00017_class_mermaid.svg
+++ b/docs/test_cases/t00017_class_mermaid.svg
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L5">
+        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L5">
           <g title="A" id="classId-C_0000121332093434690887-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L7">
+        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L7">
           <g title="B" id="classId-C_0001424864837456200487-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L9">
+        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L9">
           <g title="C" id="classId-C_0002151170391844743478-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L11">
+        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L11">
           <g title="D" id="classId-C_0001378112127131766972-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L13">
+        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L13">
           <g title="E" id="classId-C_0001535300935831802489-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L15">
+        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L15">
           <g title="F" id="classId-C_0001803800465279710134-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,7 +300,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L17">
+        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L17">
           <g title="G" id="classId-C_0001135797791892670246-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L19">
+        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L19">
           <g title="H" id="classId-C_0001243547836571712317-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,7 +338,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L21">
+        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L21">
           <g title="I" id="classId-C_0000387733199705628658-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L23">
+        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L23">
           <g title="J" id="classId-C_0000747991828672433537-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,7 +376,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L25">
+        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L25">
           <g title="K" id="classId-C_0001783571342994833467-10" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,7 +395,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00017/t00017.cc#L27">
+        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00017/t00017.cc#L27">
           <g title="R" id="classId-C_0000287495916564113342-11" class="node default clickable">
             <rect height="167" width="445.96875" y="-83.5" x="-222.984375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="222.984375" x1="-222.984375" class="divider"/>
diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md
index 3b358daa..639523e5 100644
--- a/docs/test_cases/t00018.md
+++ b/docs/test_cases/t00018.md
@@ -165,6 +165,7 @@ void widget::draw(const clanguml::t00018::widget &w)
       "methods": [
         {
           "access": "public",
+          "display_name": "draw",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -192,10 +193,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 13,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "draw",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -223,10 +226,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 14,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "widget",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -254,6 +259,7 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 15,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -294,6 +300,7 @@ void widget::draw(const clanguml::t00018::widget &w)
       "methods": [
         {
           "access": "public",
+          "display_name": "draw",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -316,10 +323,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 21,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "draw",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -342,10 +351,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 22,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "shown",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -368,10 +379,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 23,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         },
         {
           "access": "public",
+          "display_name": "widget",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -399,10 +412,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 24,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "~widget",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -425,10 +440,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 25,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "widget",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -456,10 +473,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 27,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "widget",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -487,10 +506,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 29,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "operator=",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -518,10 +539,12 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 30,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "widget &"
         },
         {
           "access": "public",
+          "display_name": "operator=",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -549,6 +572,7 @@ void widget::draw(const clanguml::t00018::widget &w)
             "line": 31,
             "translation_unit": "t00018.cc"
           },
+          "template_parameters": [],
           "type": "widget &"
         }
       ],
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index c719205a..6ce5b597 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="395px" preserveAspectRatio="none" style="width:317px;height:395px;" version="1.1" viewBox="0 0 317 395" width="317px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1xk1ev4eg1e3t" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ofvh087xjsd3" 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,121 +9,121 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xk1ev4eg1e3t)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ofvh087xjsd3)" height="107.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="40.5" y="8"/>
       <ellipse cx="114.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.7188,29.6406 Q117.1406,29.9375 116.5,30.0781 Q115.8594,30.2344 115.1563,30.2344 Q112.6563,30.2344 111.3281,28.5938 Q110.0156,26.9375 110.0156,23.8125 Q110.0156,20.6875 111.3281,19.0313 Q112.6563,17.375 115.1563,17.375 Q115.8594,17.375 116.5,17.5313 Q117.1563,17.6875 117.7188,17.9844 L117.7188,20.7031 Q117.0938,20.125 116.5,19.8594 Q115.9063,19.5781 115.2813,19.5781 Q113.9375,19.5781 113.25,20.6563 Q112.5625,21.7188 112.5625,23.8125 Q112.5625,25.9063 113.25,26.9844 Q113.9375,28.0469 115.2813,28.0469 Q115.9063,28.0469 116.5,27.7813 Q117.0938,27.5 117.7188,26.9219 L117.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="135.25" y="28.1543">impl::widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="46"/>
       <ellipse cx="51.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="60.5" y="54.2104">widget(int n) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="41.5" x2="270.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="66.8047"/>
       <ellipse cx="51.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="205" x="60.5" y="75.0151">draw(const widget &amp; w) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="79.6094"/>
       <ellipse cx="51.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="60.5" y="87.8198">draw(const widget &amp; w) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="270.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="46.5" y="100.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="102.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="60.5" y="108.6245">n : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xk1ev4eg1e3t)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ofvh087xjsd3)" height="192.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="6" y="192"/>
       <ellipse cx="131.25" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.2188,213.6406 Q133.6406,213.9375 133,214.0781 Q132.3594,214.2344 131.6563,214.2344 Q129.1563,214.2344 127.8281,212.5938 Q126.5156,210.9375 126.5156,207.8125 Q126.5156,204.6875 127.8281,203.0313 Q129.1563,201.375 131.6563,201.375 Q132.3594,201.375 133,201.5313 Q133.6563,201.6875 134.2188,201.9844 L134.2188,204.7031 Q133.5938,204.125 133,203.8594 Q132.4063,203.5781 131.7813,203.5781 Q130.4375,203.5781 129.75,204.6563 Q129.0625,205.7188 129.0625,207.8125 Q129.0625,209.9063 129.75,210.9844 Q130.4375,212.0469 131.7813,212.0469 Q132.4063,212.0469 133,211.7813 Q133.5938,211.5 134.2188,210.9219 L134.2188,213.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="151.75" y="212.1543">widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="224" y2="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230"/>
       <ellipse cx="17" cy="235" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="238.2104">widget(int) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="242.8047"/>
       <ellipse cx="17" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="26" y="251.0151">widget(widget &amp;&amp;) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="255.6094"/>
       <ellipse cx="17" cy="260.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="263.8198">widget(const widget &amp;) = deleted : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="268.4141"/>
       <ellipse cx="17" cy="273.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="26" y="276.6245">~widget() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="283.2188" y2="283.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="289.2188"/>
       <ellipse cx="17" cy="294.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="26" y="297.4292">operator=(widget &amp;&amp;) : widget &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="302.0234"/>
       <ellipse cx="17" cy="307.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="310.2339">operator=(const widget &amp;) = deleted : widget &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="305" y1="316.8281" y2="316.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.8281"/>
       <ellipse cx="17" cy="327.8281" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="331.0386">draw() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.6328"/>
       <ellipse cx="17" cy="340.6328" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="26" y="343.8433">draw() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348.4375"/>
       <ellipse cx="17" cy="353.4375" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="26" y="356.6479">shown() const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="305" y1="363.2422" y2="363.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="369.2422"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="371.2422"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="377.4526">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
     </a>
     <path d="M150.85,115.27 C150.08,125.14 149.41,135.38 149,145 C148.43,158.51 148.42,172.74 148.76,186.76 " fill="none" id="C_0000130502639682787993-&gt;C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg
index 72b3aceb..16a5d357 100644
--- a/docs/test_cases/t00018_class_mermaid.svg
+++ b/docs/test_cases/t00018_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018_impl.h#L9">
+        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018_impl.h#L9">
           <g title="widget" id="classId-C_0000130502639682787993-0" class="node default clickable">
             <rect height="145" width="284" y="-72.5" x="-142" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="142" x1="-142" class="divider"/>
@@ -117,7 +117,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00018/t00018.h#L17">
+        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00018/t00018.h#L17">
           <g title="widget" id="classId-C_0001005661284373854088-1" class="node default clickable">
             <rect height="277" width="282.703125" y="-138.5" x="-141.3515625" class="outer title-state"/>
             <line y2="-108.5" y1="-108.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md
index 88c11181..c4e9c510 100644
--- a/docs/test_cases/t00019.md
+++ b/docs/test_cases/t00019.md
@@ -173,6 +173,7 @@ class Base {
       "methods": [
         {
           "access": "private",
+          "display_name": "Base",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -195,10 +196,12 @@ class Base {
             "line": 10,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "private",
+          "display_name": "~Base",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -221,10 +224,12 @@ class Base {
             "line": 12,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "private",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -247,10 +252,12 @@ class Base {
             "line": 14,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "private",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -273,6 +280,7 @@ class Base {
             "line": 16,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         }
       ],
@@ -300,6 +308,7 @@ class Base {
       "methods": [
         {
           "access": "private",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -322,10 +331,12 @@ class Base {
             "line": 13,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "private",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -348,6 +359,7 @@ class Base {
             "line": 19,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         }
       ],
@@ -382,6 +394,7 @@ class Base {
       "methods": [
         {
           "access": "private",
+          "display_name": "all_calls_count",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -404,6 +417,7 @@ class Base {
             "line": 14,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "int"
         }
       ],
@@ -463,6 +477,7 @@ class Base {
       "methods": [
         {
           "access": "private",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -485,10 +500,12 @@ class Base {
             "line": 12,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "private",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -511,10 +528,12 @@ class Base {
             "line": 18,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "private",
+          "display_name": "m1_calls",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -537,10 +556,12 @@ class Base {
             "line": 24,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "private",
+          "display_name": "m2_calls",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -563,6 +584,7 @@ class Base {
             "line": 26,
             "translation_unit": "t00019.cc"
           },
+          "template_parameters": [],
           "type": "int"
         }
       ],
@@ -615,7 +637,7 @@ class Base {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00019::Base"
+          "type": "Base"
         }
       ],
       "type": "class"
@@ -658,7 +680,7 @@ class Base {
               "type": "clanguml::t00019::Base"
             }
           ],
-          "type": "clanguml::t00019::Layer3"
+          "type": "Layer3"
         }
       ],
       "type": "class"
@@ -708,7 +730,7 @@ class Base {
               "type": "clanguml::t00019::Layer3"
             }
           ],
-          "type": "clanguml::t00019::Layer2"
+          "type": "Layer2"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index 3d115d3c..5cb39c1f 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="526px" preserveAspectRatio="none" style="width:781px;height:526px;" version="1.1" viewBox="0 0 781 526" width="781px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fse9zx6vwaz0i" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1cvzwhu5ia26k" 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,45 +9,45 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="396.5" y="17"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="107.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="396.5" y="17"/>
       <ellipse cx="488.25" cy="33" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M491.2188,38.6406 Q490.6406,38.9375 490,39.0781 Q489.3594,39.2344 488.6563,39.2344 Q486.1563,39.2344 484.8281,37.5938 Q483.5156,35.9375 483.5156,32.8125 Q483.5156,29.6875 484.8281,28.0313 Q486.1563,26.375 488.6563,26.375 Q489.3594,26.375 490,26.5313 Q490.6563,26.6875 491.2188,26.9844 L491.2188,29.7031 Q490.5938,29.125 490,28.8594 Q489.4063,28.5781 488.7813,28.5781 Q487.4375,28.5781 486.75,29.6563 Q486.0625,30.7188 486.0625,32.8125 Q486.0625,34.9063 486.75,35.9844 Q487.4375,37.0469 488.7813,37.0469 Q489.4063,37.0469 490,36.7813 Q490.5938,36.5 491.2188,35.9219 L491.2188,38.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="508.75" y="37.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="397.5" x2="618.5" y1="49" y2="49"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="402.5" y="55"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="404.5" y="57"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="128" x="416.5" y="63.2104">Base() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="402.5" y="67.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="404.5" y="69.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="416.5" y="76.0151">~Base() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="397.5" x2="618.5" y1="82.6094" y2="82.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="402.5" y="88.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="404.5" y="90.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="416.5" y="96.8198">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="402.5" y="101.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="404.5" y="103.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="416.5" y="109.6245">m2() : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="397.5" x2="618.5" y1="116.2188" y2="116.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="316"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="316"/>
       <ellipse cx="21" cy="332" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,337.6406 Q23.3906,337.9375 22.75,338.0781 Q22.1094,338.2344 21.4063,338.2344 Q18.9063,338.2344 17.5781,336.5938 Q16.2656,334.9375 16.2656,331.8125 Q16.2656,328.6875 17.5781,327.0313 Q18.9063,325.375 21.4063,325.375 Q22.1094,325.375 22.75,325.5313 Q23.4063,325.6875 23.9688,325.9844 L23.9688,328.7031 Q23.3438,328.125 22.75,327.8594 Q22.1563,327.5781 21.5313,327.5781 Q20.1875,327.5781 19.5,328.6563 Q18.8125,329.7188 18.8125,331.8125 Q18.8125,333.9063 19.5,334.9844 Q20.1875,336.0469 21.5313,336.0469 Q22.1563,336.0469 22.75,335.7813 Q23.3438,335.5 23.9688,334.9219 L23.9688,337.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="35" y="336.1543">Layer1</text>
@@ -55,23 +55,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="85" y="325.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="348" y2="348"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="354"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="356"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="362.2104">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="366.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="368.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="375.0151">m2() : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="381.6094" y2="381.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="132.5" y="194"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="132.5" y="194"/>
       <ellipse cx="159.65" cy="210" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M162.6188,215.6406 Q162.0406,215.9375 161.4,216.0781 Q160.7594,216.2344 160.0563,216.2344 Q157.5563,216.2344 156.2281,214.5938 Q154.9156,212.9375 154.9156,209.8125 Q154.9156,206.6875 156.2281,205.0313 Q157.5563,203.375 160.0563,203.375 Q160.7594,203.375 161.4,203.5313 Q162.0563,203.6875 162.6188,203.9844 L162.6188,206.7031 Q161.9938,206.125 161.4,205.8594 Q160.8063,205.5781 160.1813,205.5781 Q158.8375,205.5781 158.15,206.6563 Q157.4625,207.7188 157.4625,209.8125 Q157.4625,211.9063 158.15,212.9844 Q158.8375,214.0469 160.1813,214.0469 Q160.8063,214.0469 161.4,213.7813 Q161.9938,213.5 162.6188,212.9219 L162.6188,215.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="176.35" y="214.1543">Layer2</text>
@@ -79,16 +79,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="238.5" y="203.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133.5" x2="308.5" y1="226" y2="226"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138.5" y="232"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="140.5" y="234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer2.h#L14" xlink:show="new" xlink:title="all_calls_count" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="152.5" y="240.2104">all_calls_count() const : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="133.5" x2="308.5" y1="246.8047" y2="246.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="212" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="212" y="8"/>
       <ellipse cx="227" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M229.9688,29.6406 Q229.3906,29.9375 228.75,30.0781 Q228.1094,30.2344 227.4063,30.2344 Q224.9063,30.2344 223.5781,28.5938 Q222.2656,26.9375 222.2656,23.8125 Q222.2656,20.6875 223.5781,19.0313 Q224.9063,17.375 227.4063,17.375 Q228.1094,17.375 228.75,17.5313 Q229.4063,17.6875 229.9688,17.9844 L229.9688,20.7031 Q229.3438,20.125 228.75,19.8594 Q228.1563,19.5781 227.5313,19.5781 Q226.1875,19.5781 225.5,20.6563 Q224.8125,21.7188 224.8125,23.8125 Q224.8125,25.9063 225.5,26.9844 Q226.1875,28.0469 227.5313,28.0469 Q228.1563,28.0469 228.75,27.7813 Q229.3438,27.5 229.9688,26.9219 L229.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="241" y="28.1543">Layer3</text>
@@ -96,50 +96,50 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="291" y="17.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="361" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="218" y="46"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="220" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="232" y="54.2104">m1() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="218" y="58.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="220" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L24" xlink:show="new" xlink:title="m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="232" y="67.0151">m1_calls() const : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="218" y="71.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="220" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="232" y="79.8198">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="218" y="84.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="220" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L26" xlink:show="new" xlink:title="m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="232" y="92.6245">m2_calls() const : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="361" y1="99.2188" y2="99.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="218" y="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="220" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="232" y="113.4292">m_m1_calls : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="218" y="118.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="220" y="120.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="232" y="126.2339">m_m2_calls : int</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="344.5" y="200.5"/>
+    <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="344.5" y="200.5"/>
     <ellipse cx="359.5" cy="216.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M362.4688,222.1406 Q361.8906,222.4375 361.25,222.5781 Q360.6094,222.7344 359.9063,222.7344 Q357.4063,222.7344 356.0781,221.0938 Q354.7656,219.4375 354.7656,216.3125 Q354.7656,213.1875 356.0781,211.5313 Q357.4063,209.875 359.9063,209.875 Q360.6094,209.875 361.25,210.0313 Q361.9063,210.1875 362.4688,210.4844 L362.4688,213.2031 Q361.8438,212.625 361.25,212.3594 Q360.6563,212.0781 360.0313,212.0781 Q358.6875,212.0781 358,213.1563 Q357.3125,214.2188 357.3125,216.3125 Q357.3125,218.4063 358,219.4844 Q358.6875,220.5469 360.0313,220.5469 Q360.6563,220.5469 361.25,220.2813 Q361.8438,220 362.4688,219.4219 L362.4688,222.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="373.5" y="220.6543">Layer3</text>
@@ -147,7 +147,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="423.5" y="209.6387">Base</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="450.5" y1="232.5" y2="232.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="450.5" y1="240.5" y2="240.5"/>
-    <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="329"/>
+    <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="329"/>
     <ellipse cx="206" cy="345" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M208.9688,350.6406 Q208.3906,350.9375 207.75,351.0781 Q207.1094,351.2344 206.4063,351.2344 Q203.9063,351.2344 202.5781,349.5938 Q201.2656,347.9375 201.2656,344.8125 Q201.2656,341.6875 202.5781,340.0313 Q203.9063,338.375 206.4063,338.375 Q207.1094,338.375 207.75,338.5313 Q208.4063,338.6875 208.9688,338.9844 L208.9688,341.7031 Q208.3438,341.125 207.75,340.8594 Q207.1563,340.5781 206.5313,340.5781 Q205.1875,340.5781 204.5,341.6563 Q203.8125,342.7188 203.8125,344.8125 Q203.8125,346.9063 204.5,347.9844 Q205.1875,349.0469 206.5313,349.0469 Q207.1563,349.0469 207.75,348.7813 Q208.3438,348.5 208.9688,347.9219 L208.9688,350.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="220" y="349.1543">Layer2</text>
@@ -155,7 +155,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="270" y="338.1387">Layer3&lt;Base&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="361" y2="361"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="369" y2="369"/>
-    <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="159.5" y="467"/>
+    <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="159.5" y="467"/>
     <ellipse cx="174.5" cy="483" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M177.4688,488.6406 Q176.8906,488.9375 176.25,489.0781 Q175.6094,489.2344 174.9063,489.2344 Q172.4063,489.2344 171.0781,487.5938 Q169.7656,485.9375 169.7656,482.8125 Q169.7656,479.6875 171.0781,478.0313 Q172.4063,476.375 174.9063,476.375 Q175.6094,476.375 176.25,476.5313 Q176.9063,476.6875 177.4688,476.9844 L177.4688,479.7031 Q176.8438,479.125 176.25,478.8594 Q175.6563,478.5781 175.0313,478.5781 Q173.6875,478.5781 173,479.6563 Q172.3125,480.7188 172.3125,482.8125 Q172.3125,484.9063 173,485.9844 Q173.6875,487.0469 175.0313,487.0469 Q175.6563,487.0469 176.25,486.7813 Q176.8438,486.5 177.4688,485.9219 L177.4688,488.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="188.5" y="487.1543">Layer1</text>
@@ -163,19 +163,19 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="238.5" y="476.1387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="160.5" x2="391.5" y1="499" y2="499"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="160.5" x2="391.5" y1="507" y2="507"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fse9zx6vwaz0i)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="322.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cvzwhu5ia26k)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="322.5"/>
       <ellipse cx="574.75" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M577.7188,344.1406 Q577.1406,344.4375 576.5,344.5781 Q575.8594,344.7344 575.1563,344.7344 Q572.6563,344.7344 571.3281,343.0938 Q570.0156,341.4375 570.0156,338.3125 Q570.0156,335.1875 571.3281,333.5313 Q572.6563,331.875 575.1563,331.875 Q575.8594,331.875 576.5,332.0313 Q577.1563,332.1875 577.7188,332.4844 L577.7188,335.2031 Q577.0938,334.625 576.5,334.3594 Q575.9063,334.0781 575.2813,334.0781 Q573.9375,334.0781 573.25,335.1563 Q572.5625,336.2188 572.5625,338.3125 Q572.5625,340.4063 573.25,341.4844 Q573.9375,342.5469 575.2813,342.5469 Q575.9063,342.5469 576.5,342.2813 Q577.0938,342 577.7188,341.4219 L577.7188,344.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="595.25" y="342.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="354.5" y2="354.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="362.5" y2="362.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="368.5"/>
       <ellipse cx="407" cy="373.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="376.7104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
     </a>
     <path d="M344.03,149.59 C357.61,168.19 371.06,186.61 381.14,200.41 " fill="none" id="C_0001853410560073854945&lt;-C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg
index 0d6a0821..1c90ac24 100644
--- a/docs/test_cases/t00019_class_mermaid.svg
+++ b/docs/test_cases/t00019_class_mermaid.svg
@@ -132,7 +132,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_base.h#L8">
+        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_base.h#L8">
           <g title="Base" id="classId-C_0000261668487476634123-0" class="node default clickable">
             <rect height="145" width="254.671875" y="-72.5" x="-127.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
@@ -171,7 +171,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer1.h#L9">
+        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer1.h#L9">
           <g title="Layer1" id="classId-C_0000902631298537519271-1" class="node default clickable">
             <rect height="101" width="175.09375" y="-50.5" x="-87.546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.546875" x1="-87.546875" class="divider"/>
@@ -200,7 +200,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer2.h#L6">
+        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer2.h#L6">
           <g title="Layer2" id="classId-C_0001115150925302580647-2" class="node default clickable">
             <rect height="79" width="217.75" y="-39.5" x="-108.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="108.875" x1="-108.875" class="divider"/>
@@ -224,7 +224,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019_layer3.h#L8">
+        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019_layer3.h#L8">
           <g title="Layer3" id="classId-C_0001853410560073854945-3" class="node default clickable">
             <rect height="189" width="175.9375" y="-94.5" x="-87.96875" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="87.96875" x1="-87.96875" class="divider"/>
@@ -273,7 +273,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L269">
+        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L269">
           <g title="Layer3" id="classId-C_0000972890420743280319-4" class="node default clickable">
             <rect height="57" width="123.53125" y="-28.5" x="-61.765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="61.765625" x1="-61.765625" class="divider"/>
@@ -292,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L269">
+        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L269">
           <g title="Layer2" id="classId-C_0000129784999866998870-5" class="node default clickable">
             <rect height="57" width="193.8125" y="-28.5" x="-96.90625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="96.90625" x1="-96.90625" class="divider"/>
@@ -311,7 +311,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L269">
+        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L269">
           <g title="Layer1" id="classId-C_0000659076058325663708-6" class="node default clickable">
             <rect height="57" width="264.09375" y="-28.5" x="-132.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="132.046875" x1="-132.046875" class="divider"/>
@@ -330,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00019/t00019.cc#L11">
+        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00019/t00019.cc#L11">
           <g title="A" id="classId-C_0001015164998787089197-7" class="node default clickable">
             <rect height="79" width="444.203125" y="-39.5" x="-222.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="222.1015625" x1="-222.1015625" class="divider"/>
diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md
index 7a3b031a..4413ea2b 100644
--- a/docs/test_cases/t00020.md
+++ b/docs/test_cases/t00020.md
@@ -115,6 +115,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "~ProductA",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -137,10 +138,12 @@ public:
             "line": 8,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "sell",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -168,6 +171,7 @@ public:
             "line": 9,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         }
       ],
@@ -202,6 +206,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "sell",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -229,6 +234,7 @@ public:
             "line": 14,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         }
       ],
@@ -263,6 +269,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "sell",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -290,6 +297,7 @@ public:
             "line": 19,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         }
       ],
@@ -317,6 +325,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "~ProductB",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -339,10 +348,12 @@ public:
             "line": 24,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "buy",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -370,6 +381,7 @@ public:
             "line": 25,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         }
       ],
@@ -404,6 +416,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "buy",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -431,6 +444,7 @@ public:
             "line": 30,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         }
       ],
@@ -465,6 +479,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "buy",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -492,6 +507,7 @@ public:
             "line": 35,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         }
       ],
@@ -519,6 +535,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "make_a",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -541,10 +558,12 @@ public:
             "line": 40,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "std::unique_ptr<ProductA>"
         },
         {
           "access": "public",
+          "display_name": "make_b",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -567,6 +586,7 @@ public:
             "line": 41,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "std::unique_ptr<ProductB>"
         }
       ],
@@ -601,6 +621,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "make_a",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -623,10 +644,12 @@ public:
             "line": 46,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "std::unique_ptr<ProductA>"
         },
         {
           "access": "public",
+          "display_name": "make_b",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -649,6 +672,7 @@ public:
             "line": 51,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "std::unique_ptr<ProductB>"
         }
       ],
@@ -683,6 +707,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "make_a",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -705,10 +730,12 @@ public:
             "line": 59,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "std::unique_ptr<ProductA>"
         },
         {
           "access": "public",
+          "display_name": "make_b",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -731,6 +758,7 @@ public:
             "line": 64,
             "translation_unit": "t00020.cc"
           },
+          "template_parameters": [],
           "type": "std::unique_ptr<ProductB>"
         }
       ],
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 9b669b9b..5510637b 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="886px" preserveAspectRatio="none" style="width:763px;height:886px;" version="1.1" viewBox="0 0 763 886" width="763px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1wfz05eyfh2pn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18fdqnfwo0jl9" 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,175 +9,175 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="81.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="280.5" y="142"/>
       <ellipse cx="370.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M370.3594,153.3438 L369.2031,158.4219 L371.5313,158.4219 L370.3594,153.3438 Z M368.875,151.1094 L371.8594,151.1094 L375.2188,163.5 L372.7656,163.5 L372,160.4375 L368.7188,160.4375 L367.9688,163.5 L365.5313,163.5 L368.875,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="390.75" y="162.1543">ProductA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="180"/>
       <ellipse cx="291.5" cy="185" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L8" xlink:show="new" xlink:title="~ProductA" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="218" x="300.5" y="188.2104">~ProductA() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="281.5" x2="523.5" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="286.5" y="200.8047"/>
       <ellipse cx="291.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L9" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="300.5" y="209.0151">sell(int price) const = 0 : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="523.5" y1="215.6094" y2="215.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="178" y="284"/>
       <ellipse cx="226.75" cy="300" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M229.7188,305.6406 Q229.1406,305.9375 228.5,306.0781 Q227.8594,306.2344 227.1563,306.2344 Q224.6563,306.2344 223.3281,304.5938 Q222.0156,302.9375 222.0156,299.8125 Q222.0156,296.6875 223.3281,295.0313 Q224.6563,293.375 227.1563,293.375 Q227.8594,293.375 228.5,293.5313 Q229.1563,293.6875 229.7188,293.9844 L229.7188,296.7031 Q229.0938,296.125 228.5,295.8594 Q227.9063,295.5781 227.2813,295.5781 Q225.9375,295.5781 225.25,296.6563 Q224.5625,297.7188 224.5625,299.8125 Q224.5625,301.9063 225.25,302.9844 Q225.9375,304.0469 227.2813,304.0469 Q227.9063,304.0469 228.5,303.7813 Q229.0938,303.5 229.7188,302.9219 L229.7188,305.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="247.25" y="304.1543">ProductA1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="316" y2="316"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="184" y="322"/>
       <ellipse cx="189" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L14" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="198" y="330.2104">sell(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="348" y1="336.8047" y2="336.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="527" y="411.5"/>
       <ellipse cx="575.75" cy="427.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M578.7188,433.1406 Q578.1406,433.4375 577.5,433.5781 Q576.8594,433.7344 576.1563,433.7344 Q573.6563,433.7344 572.3281,432.0938 Q571.0156,430.4375 571.0156,427.3125 Q571.0156,424.1875 572.3281,422.5313 Q573.6563,420.875 576.1563,420.875 Q576.8594,420.875 577.5,421.0313 Q578.1563,421.1875 578.7188,421.4844 L578.7188,424.2031 Q578.0938,423.625 577.5,423.3594 Q576.9063,423.0781 576.2813,423.0781 Q574.9375,423.0781 574.25,424.1563 Q573.5625,425.2188 573.5625,427.3125 Q573.5625,429.4063 574.25,430.4844 Q574.9375,431.5469 576.2813,431.5469 Q576.9063,431.5469 577.5,431.2813 Q578.0938,431 578.7188,430.4219 L578.7188,433.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="596.25" y="431.6543">ProductA2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="443.5" y2="443.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="533" y="449.5"/>
       <ellipse cx="538" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L19" xlink:show="new" xlink:title="sell" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="547" y="457.7104">sell(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="528" x2="697" y1="464.3047" y2="464.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="81.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="539"/>
       <ellipse cx="96.25" cy="555" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M96.3594,550.3438 L95.2031,555.4219 L97.5313,555.4219 L96.3594,550.3438 Z M94.875,548.1094 L97.8594,548.1094 L101.2188,560.5 L98.7656,560.5 L98,557.4375 L94.7188,557.4375 L93.9688,560.5 L91.5313,560.5 L94.875,548.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="116.75" y="559.1543">ProductB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="571" y2="571"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="577"/>
       <ellipse cx="17" cy="582" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L24" xlink:show="new" xlink:title="~ProductB" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="26" y="585.2104">~ProductB() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="250" y1="591.8047" y2="591.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="597.8047"/>
       <ellipse cx="17" cy="602.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L25" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="606.0151">buy(int price) const = 0 : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="612.6094" y2="612.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="249" y="681"/>
       <ellipse cx="297.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M300.7188,702.6406 Q300.1406,702.9375 299.5,703.0781 Q298.8594,703.2344 298.1563,703.2344 Q295.6563,703.2344 294.3281,701.5938 Q293.0156,699.9375 293.0156,696.8125 Q293.0156,693.6875 294.3281,692.0313 Q295.6563,690.375 298.1563,690.375 Q298.8594,690.375 299.5,690.5313 Q300.1563,690.6875 300.7188,690.9844 L300.7188,693.7031 Q300.0938,693.125 299.5,692.8594 Q298.9063,692.5781 298.2813,692.5781 Q296.9375,692.5781 296.25,693.6563 Q295.5625,694.7188 295.5625,696.8125 Q295.5625,698.9063 296.25,699.9844 Q296.9375,701.0469 298.2813,701.0469 Q298.9063,701.0469 299.5,700.7813 Q300.0938,700.5 300.7188,699.9219 L300.7188,702.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="318.25" y="701.1543">ProductB1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="713" y2="713"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="255" y="719"/>
       <ellipse cx="260" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L30" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="269" y="727.2104">buy(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="250" x2="419" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="43" y="681"/>
       <ellipse cx="91.75" cy="697" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M94.7188,702.6406 Q94.1406,702.9375 93.5,703.0781 Q92.8594,703.2344 92.1563,703.2344 Q89.6563,703.2344 88.3281,701.5938 Q87.0156,699.9375 87.0156,696.8125 Q87.0156,693.6875 88.3281,692.0313 Q89.6563,690.375 92.1563,690.375 Q92.8594,690.375 93.5,690.5313 Q94.1563,690.6875 94.7188,690.9844 L94.7188,693.7031 Q94.0938,693.125 93.5,692.8594 Q92.9063,692.5781 92.2813,692.5781 Q90.9375,692.5781 90.25,693.6563 Q89.5625,694.7188 89.5625,696.8125 Q89.5625,698.9063 90.25,699.9844 Q90.9375,701.0469 92.2813,701.0469 Q92.9063,701.0469 93.5,700.7813 Q94.0938,700.5 94.7188,699.9219 L94.7188,702.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="112.25" y="701.1543">ProductB2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="713" y2="713"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="719"/>
       <ellipse cx="54" cy="724" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L35" xlink:show="new" xlink:title="buy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="63" y="727.2104">buy(int price) const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="213" y1="733.8047" y2="733.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="112.5" y="8"/>
       <ellipse cx="209.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M209.8594,19.3438 L208.7031,24.4219 L211.0313,24.4219 L209.8594,19.3438 Z M208.375,17.1094 L211.3594,17.1094 L214.7188,29.5 L212.2656,29.5 L211.5,26.4375 L208.2188,26.4375 L207.4688,29.5 L205.0313,29.5 L208.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="230.25" y="28.1543">AbstractFactory</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="46"/>
       <ellipse cx="123.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L40" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="54.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="118.5" y="58.8047"/>
       <ellipse cx="123.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L41" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="132.5" y="67.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="113.5" x2="413.5" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="123.5" y="405"/>
       <ellipse cx="232.25" cy="421" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.2188,426.6406 Q234.6406,426.9375 234,427.0781 Q233.3594,427.2344 232.6563,427.2344 Q230.1563,427.2344 228.8281,425.5938 Q227.5156,423.9375 227.5156,420.8125 Q227.5156,417.6875 228.8281,416.0313 Q230.1563,414.375 232.6563,414.375 Q233.3594,414.375 234,414.5313 Q234.6563,414.6875 235.2188,414.9844 L235.2188,417.7031 Q234.5938,417.125 234,416.8594 Q233.4063,416.5781 232.7813,416.5781 Q231.4375,416.5781 230.75,417.6563 Q230.0625,418.7188 230.0625,420.8125 Q230.0625,422.9063 230.75,423.9844 Q231.4375,425.0469 232.7813,425.0469 Q233.4063,425.0469 234,424.7813 Q234.5938,424.5 235.2188,423.9219 L235.2188,426.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="252.75" y="425.1543">Factory1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="437" y2="437"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="443"/>
       <ellipse cx="134.5" cy="448" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L46" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="143.5" y="451.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="129.5" y="455.8047"/>
       <ellipse cx="134.5" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L51" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="143.5" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="124.5" x2="402.5" y1="470.6094" y2="470.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wfz05eyfh2pn)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18fdqnfwo0jl9)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="333.5" y="802"/>
       <ellipse cx="442.25" cy="818" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M445.2188,823.6406 Q444.6406,823.9375 444,824.0781 Q443.3594,824.2344 442.6563,824.2344 Q440.1563,824.2344 438.8281,822.5938 Q437.5156,820.9375 437.5156,817.8125 Q437.5156,814.6875 438.8281,813.0313 Q440.1563,811.375 442.6563,811.375 Q443.3594,811.375 444,811.5313 Q444.6563,811.6875 445.2188,811.9844 L445.2188,814.7031 Q444.5938,814.125 444,813.8594 Q443.4063,813.5781 442.7813,813.5781 Q441.4375,813.5781 440.75,814.6563 Q440.0625,815.7188 440.0625,817.8125 Q440.0625,819.9063 440.75,820.9844 Q441.4375,822.0469 442.7813,822.0469 Q443.4063,822.0469 444,821.7813 Q444.5938,821.5 445.2188,820.9219 L445.2188,823.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="462.75" y="822.1543">Factory2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="834" y2="834"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="840"/>
       <ellipse cx="344.5" cy="845" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L59" xlink:show="new" xlink:title="make_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="353.5" y="848.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="339.5" y="852.8047"/>
       <ellipse cx="344.5" cy="857.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L64" xlink:show="new" xlink:title="make_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="353.5" y="861.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="334.5" x2="612.5" y1="867.6094" y2="867.6094"/>
diff --git a/docs/test_cases/t00020_class_mermaid.svg b/docs/test_cases/t00020_class_mermaid.svg
index 77e68d69..bfa2a740 100644
--- a/docs/test_cases/t00020_class_mermaid.svg
+++ b/docs/test_cases/t00020_class_mermaid.svg
@@ -186,7 +186,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L6">
+        <a transform="translate(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L6">
           <g title="ProductA" id="classId-C_0000425267229659464944-0" class="node default clickable">
             <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
@@ -215,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L12">
+        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L12">
           <g title="ProductA1" id="classId-C_0001756496029797864207-1" class="node default clickable">
             <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
@@ -239,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L17">
+        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L17">
           <g title="ProductA2" id="classId-C_0001531708592885216981-2" class="node default clickable">
             <rect height="79" width="210.203125" y="-39.5" x="-105.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L22">
+        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L22">
           <g title="ProductB" id="classId-C_0002235759006374865842-3" class="node default clickable">
             <rect height="123" width="288.03125" y="-61.5" x="-144.015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="144.015625" x1="-144.015625" class="divider"/>
@@ -292,7 +292,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L28">
+        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L28">
           <g title="ProductB1" id="classId-C_0001465493024233223845-4" class="node default clickable">
             <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
@@ -316,7 +316,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L33">
+        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L33">
           <g title="ProductB2" id="classId-C_0002154665562370057871-5" class="node default clickable">
             <rect height="79" width="211.984375" y="-39.5" x="-105.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
@@ -340,7 +340,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L38">
+        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L38">
           <g title="AbstractFactory" id="classId-C_0001705546469218961425-6" class="node default clickable">
             <rect height="123" width="347.1875" y="-61.5" x="-173.59375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="173.59375" x1="-173.59375" class="divider"/>
@@ -369,7 +369,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L44">
+        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L44">
           <g title="Factory1" id="classId-C_0000692346848484854107-7" class="node default clickable">
             <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
@@ -398,7 +398,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00020/t00020.cc#L57">
+        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00020/t00020.cc#L57">
           <g title="Factory2" id="classId-C_0001566325870805013023-8" class="node default clickable">
             <rect height="101" width="347.1875" y="-50.5" x="-173.59375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="173.59375" x1="-173.59375" class="divider"/>
diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md
index f67c0a26..61934cfc 100644
--- a/docs/test_cases/t00021.md
+++ b/docs/test_cases/t00021.md
@@ -89,6 +89,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "~Visitor",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -111,10 +112,12 @@ public:
             "line": 11,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "visit_A",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -142,10 +145,12 @@ public:
             "line": 12,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "visit_B",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -173,6 +178,7 @@ public:
             "line": 13,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -207,6 +213,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "visit_A",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -234,10 +241,12 @@ public:
             "line": 18,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "visit_B",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -265,6 +274,7 @@ public:
             "line": 19,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -299,6 +309,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "visit_A",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -326,10 +337,12 @@ public:
             "line": 24,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "visit_B",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -357,6 +370,7 @@ public:
             "line": 25,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -391,6 +405,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "visit_A",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -418,10 +433,12 @@ public:
             "line": 30,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "visit_B",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -449,6 +466,7 @@ public:
             "line": 31,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -476,6 +494,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "~Item",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -498,10 +517,12 @@ public:
             "line": 36,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "accept",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -529,6 +550,7 @@ public:
             "line": 37,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -563,6 +585,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "accept",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -590,6 +613,7 @@ public:
             "line": 42,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -624,6 +648,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "accept",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -651,6 +676,7 @@ public:
             "line": 47,
             "translation_unit": "t00021.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index cfcc0ebf..c5647255 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="509px" preserveAspectRatio="none" style="width:990px;height:509px;" version="1.1" viewBox="0 0 990 509" width="990px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1akwof5ev0b8t" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpgb0v3wh00uv" 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,152 +9,152 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1akwof5ev0b8t)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpgb0v3wh00uv)" height="94.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="150"/>
       <ellipse cx="469.25" cy="166" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.3594,161.3438 L468.2031,166.4219 L470.5313,166.4219 L469.3594,161.3438 Z M467.875,159.1094 L470.8594,159.1094 L474.2188,171.5 L471.7656,171.5 L471,168.4375 L467.7188,168.4375 L466.9688,171.5 L464.5313,171.5 L467.875,159.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="170.1543">Visitor</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="188"/>
       <ellipse cx="379" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="388" y="196.2104">~Visitor() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="369" x2="616" y1="202.8047" y2="202.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="208.8047"/>
       <ellipse cx="379" cy="213.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="217.0151">visit_A(const A &amp; item) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374" y="221.6094"/>
       <ellipse cx="379" cy="226.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="229.8198">visit_B(const B &amp; item) const = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="369" x2="616" y1="236.4141" y2="236.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1akwof5ev0b8t)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpgb0v3wh00uv)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="304"/>
       <ellipse cx="202.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M205.7188,325.6406 Q205.1406,325.9375 204.5,326.0781 Q203.8594,326.2344 203.1563,326.2344 Q200.6563,326.2344 199.3281,324.5938 Q198.0156,322.9375 198.0156,319.8125 Q198.0156,316.6875 199.3281,315.0313 Q200.6563,313.375 203.1563,313.375 Q203.8594,313.375 204.5,313.5313 Q205.1563,313.6875 205.7188,313.9844 L205.7188,316.7031 Q205.0938,316.125 204.5,315.8594 Q203.9063,315.5781 203.2813,315.5781 Q201.9375,315.5781 201.25,316.6563 Q200.5625,317.7188 200.5625,319.8125 Q200.5625,321.9063 201.25,322.9844 Q201.9375,324.0469 203.2813,324.0469 Q203.9063,324.0469 204.5,323.7813 Q205.0938,323.5 205.7188,322.9219 L205.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="324.1543">Visitor1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="342"/>
       <ellipse cx="128" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="137" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="123" y="354.8047"/>
       <ellipse cx="128" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="118" x2="343" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1akwof5ev0b8t)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpgb0v3wh00uv)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="304"/>
       <ellipse cx="464.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M467.7188,325.6406 Q467.1406,325.9375 466.5,326.0781 Q465.8594,326.2344 465.1563,326.2344 Q462.6563,326.2344 461.3281,324.5938 Q460.0156,322.9375 460.0156,319.8125 Q460.0156,316.6875 461.3281,315.0313 Q462.6563,313.375 465.1563,313.375 Q465.8594,313.375 466.5,313.5313 Q467.1563,313.6875 467.7188,313.9844 L467.7188,316.7031 Q467.0938,316.125 466.5,315.8594 Q465.9063,315.5781 465.2813,315.5781 Q463.9375,315.5781 463.25,316.6563 Q462.5625,317.7188 462.5625,319.8125 Q462.5625,321.9063 463.25,322.9844 Q463.9375,324.0469 465.2813,324.0469 Q465.9063,324.0469 466.5,323.7813 Q467.0938,323.5 467.7188,322.9219 L467.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="324.1543">Visitor2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="342"/>
       <ellipse cx="390" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="399" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="385" y="354.8047"/>
       <ellipse cx="390" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="380" x2="605" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1akwof5ev0b8t)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpgb0v3wh00uv)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="304"/>
       <ellipse cx="726.75" cy="320" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M729.7188,325.6406 Q729.1406,325.9375 728.5,326.0781 Q727.8594,326.2344 727.1563,326.2344 Q724.6563,326.2344 723.3281,324.5938 Q722.0156,322.9375 722.0156,319.8125 Q722.0156,316.6875 723.3281,315.0313 Q724.6563,313.375 727.1563,313.375 Q727.8594,313.375 728.5,313.5313 Q729.1563,313.6875 729.7188,313.9844 L729.7188,316.7031 Q729.0938,316.125 728.5,315.8594 Q727.9063,315.5781 727.2813,315.5781 Q725.9375,315.5781 725.25,316.6563 Q724.5625,317.7188 724.5625,319.8125 Q724.5625,321.9063 725.25,322.9844 Q725.9375,324.0469 727.2813,324.0469 Q727.9063,324.0469 728.5,323.7813 Q729.0938,323.5 729.7188,322.9219 L729.7188,325.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="324.1543">Visitor3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="342"/>
       <ellipse cx="652" cy="347" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="661" y="350.2104">visit_A(const A &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="647" y="354.8047"/>
       <ellipse cx="652" cy="359.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="363.0151">visit_B(const B &amp; item) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="867" y1="369.6094" y2="369.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1akwof5ev0b8t)" height="81.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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpgb0v3wh00uv)" height="81.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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="46"/>
       <ellipse cx="360" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="193" x="369" y="54.2104">~Item() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="350" x2="635" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="355" y="66.8047"/>
       <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <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>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="350" x2="635" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1akwof5ev0b8t)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpgb0v3wh00uv)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="438"/>
       <ellipse cx="130.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M133.2188,459.6406 Q132.6406,459.9375 132,460.0781 Q131.3594,460.2344 130.6563,460.2344 Q128.1563,460.2344 126.8281,458.5938 Q125.5156,456.9375 125.5156,453.8125 Q125.5156,450.6875 126.8281,449.0313 Q128.1563,447.375 130.6563,447.375 Q131.3594,447.375 132,447.5313 Q132.6563,447.6875 133.2188,447.9844 L133.2188,450.7031 Q132.5938,450.125 132,449.8594 Q131.4063,449.5781 130.7813,449.5781 Q129.4375,449.5781 128.75,450.6563 Q128.0625,451.7188 128.0625,453.8125 Q128.0625,455.9063 128.75,456.9844 Q129.4375,458.0469 130.7813,458.0469 Q131.4063,458.0469 132,457.7813 Q132.5938,457.5 133.2188,456.9219 L133.2188,459.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="458.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="470" y2="470"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="476"/>
       <ellipse cx="17" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="270" y1="490.8047" y2="490.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1akwof5ev0b8t)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpgb0v3wh00uv)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="438"/>
       <ellipse cx="838.25" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.2188,459.6406 Q840.6406,459.9375 840,460.0781 Q839.3594,460.2344 838.6563,460.2344 Q836.1563,460.2344 834.8281,458.5938 Q833.5156,456.9375 833.5156,453.8125 Q833.5156,450.6875 834.8281,449.0313 Q836.1563,447.375 838.6563,447.375 Q839.3594,447.375 840,447.5313 Q840.6563,447.6875 841.2188,447.9844 L841.2188,450.7031 Q840.5938,450.125 840,449.8594 Q839.4063,449.5781 838.7813,449.5781 Q837.4375,449.5781 836.75,450.6563 Q836.0625,451.7188 836.0625,453.8125 Q836.0625,455.9063 836.75,456.9844 Q837.4375,458.0469 838.7813,458.0469 Q839.4063,458.0469 840,457.7813 Q840.5938,457.5 841.2188,456.9219 L841.2188,459.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="458.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="470" y2="470"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="720" y="476"/>
       <ellipse cx="725" cy="481" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="734" y="484.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="715" x2="978" y1="490.8047" y2="490.8047"/>
diff --git a/docs/test_cases/t00021_class_mermaid.svg b/docs/test_cases/t00021_class_mermaid.svg
index dce81bfb..445413ea 100644
--- a/docs/test_cases/t00021_class_mermaid.svg
+++ b/docs/test_cases/t00021_class_mermaid.svg
@@ -236,7 +236,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L9">
+        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L9">
           <g title="Visitor" id="classId-C_0001668671110672744395-0" class="node default clickable">
             <rect height="145" width="279.546875" y="-72.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -270,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L16">
+        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L16">
           <g title="Visitor1" id="classId-C_0001028369219400401946-1" class="node default clickable">
             <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -299,7 +299,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L22">
+        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L22">
           <g title="Visitor2" id="classId-C_0001710373315476287130-2" class="node default clickable">
             <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -328,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L28">
+        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L28">
           <g title="Visitor3" id="classId-C_0001399026228179178025-3" class="node default clickable">
             <rect height="101" width="279.546875" y="-50.5" x="-139.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -357,7 +357,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L34">
+        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L34">
           <g title="Item" id="classId-C_0001491568826758947722-4" class="node default clickable">
             <rect height="123" width="324.609375" y="-61.5" x="-162.3046875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
@@ -386,7 +386,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L40">
+        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L40">
           <g title="A" id="classId-C_0001494142745564026823-5" class="node default clickable">
             <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
@@ -410,7 +410,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00021/t00021.cc#L45">
+        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00021/t00021.cc#L45">
           <g title="B" id="classId-C_0001452948650450999568-6" class="node default clickable">
             <rect height="79" width="324.609375" y="-39.5" x="-162.3046875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md
index f3f741e2..1a3b41f6 100644
--- a/docs/test_cases/t00022.md
+++ b/docs/test_cases/t00022.md
@@ -70,6 +70,7 @@ protected:
       "methods": [
         {
           "access": "public",
+          "display_name": "template_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -92,10 +93,12 @@ protected:
             "line": 8,
             "translation_unit": "t00022.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "protected",
+          "display_name": "method1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -118,10 +121,12 @@ protected:
             "line": 15,
             "translation_unit": "t00022.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "protected",
+          "display_name": "method2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -144,6 +149,7 @@ protected:
             "line": 16,
             "translation_unit": "t00022.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -178,6 +184,7 @@ protected:
       "methods": [
         {
           "access": "protected",
+          "display_name": "method1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -200,10 +207,12 @@ protected:
             "line": 21,
             "translation_unit": "t00022.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "protected",
+          "display_name": "method2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -226,6 +235,7 @@ protected:
             "line": 22,
             "translation_unit": "t00022.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -260,6 +270,7 @@ protected:
       "methods": [
         {
           "access": "protected",
+          "display_name": "method1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -282,10 +293,12 @@ protected:
             "line": 27,
             "translation_unit": "t00022.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "protected",
+          "display_name": "method2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -308,6 +321,7 @@ protected:
             "line": 28,
             "translation_unit": "t00022.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index 072cd731..386ead15 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="ff0dzwgc1zrp5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fh5oh06innoe7" 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,76 +9,76 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff0dzwgc1zrp5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh5oh06innoe7)" 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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="46"/>
       <polygon fill="#FFFF44" points="69.5,46,73.5,50,69.5,54,65.5,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="54.2104">method1() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="58.8047"/>
       <polygon fill="#FFFF44" points="69.5,58.8047,73.5,62.8047,69.5,66.8047,65.5,62.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="67.0151">method2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="64.5" y="71.6094"/>
       <ellipse cx="69.5" cy="76.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="78.5" y="79.8198">template_method() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="59.5" x2="225.5" y1="86.4141" y2="86.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff0dzwgc1zrp5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh5oh06innoe7)" 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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
       <polygon fill="#FFFF44" points="17,192,21,196,17,200,13,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="200.2104">method1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
       <polygon fill="#FFFF44" points="17,204.8047,21,208.8047,17,212.8047,13,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="213.0151">method2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="124" y1="219.6094" y2="219.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff0dzwgc1zrp5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh5oh06innoe7)" 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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="192"/>
       <polygon fill="#FFFF44" points="171,192,175,196,171,200,167,196" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="200.2104">method1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="204.8047"/>
       <polygon fill="#FFFF44" points="171,204.8047,175,208.8047,171,212.8047,167,208.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="180" y="213.0151">method2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="278" y1="219.6094" y2="219.6094"/>
diff --git a/docs/test_cases/t00022_class_mermaid.svg b/docs/test_cases/t00022_class_mermaid.svg
index 7182d5e7..8cb3bd8c 100644
--- a/docs/test_cases/t00022_class_mermaid.svg
+++ b/docs/test_cases/t00022_class_mermaid.svg
@@ -74,7 +74,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L6">
+        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L6">
           <g title="A" id="classId-C_0002012435893382068755-0" class="node default clickable">
             <rect height="145" width="201.328125" y="-72.5" x="-100.6640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
@@ -108,7 +108,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L19">
+        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L19">
           <g title="A1" id="classId-C_0002282061426381077447-1" class="node default clickable">
             <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
@@ -137,7 +137,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00022/t00022.cc#L25">
+        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00022/t00022.cc#L25">
           <g title="A2" id="classId-C_0000158819862916671538-2" class="node default clickable">
             <rect height="101" width="139.515625" y="-50.5" x="-69.7578125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md
index 2ac5d7d8..ff72e480 100644
--- a/docs/test_cases/t00023.md
+++ b/docs/test_cases/t00023.md
@@ -79,6 +79,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "~Strategy",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -101,10 +102,12 @@ private:
             "line": 8,
             "translation_unit": "t00023.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "algorithm",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -127,6 +130,7 @@ private:
             "line": 9,
             "translation_unit": "t00023.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -161,6 +165,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "algorithm",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -183,6 +188,7 @@ private:
             "line": 14,
             "translation_unit": "t00023.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -217,6 +223,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "algorithm",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -239,6 +246,7 @@ private:
             "line": 19,
             "translation_unit": "t00023.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -273,6 +281,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "algorithm",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -295,6 +304,7 @@ private:
             "line": 24,
             "translation_unit": "t00023.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -335,6 +345,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "Context",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -362,10 +373,12 @@ private:
             "line": 29,
             "translation_unit": "t00023.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "apply",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -388,6 +401,7 @@ private:
             "line": 34,
             "translation_unit": "t00023.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index 3a5fe636..949aba7f 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="393px" preserveAspectRatio="none" style="width:456px;height:393px;" version="1.1" viewBox="0 0 456 393" width="456px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffu4rmt1fhd7c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fkrke5mpsn7qi" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffu4rmt1fhd7c)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkrke5mpsn7qi)" height="81.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="104.5" y="179"/>
       <ellipse cx="194.25" cy="195" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.3594,190.3438 L193.2031,195.4219 L195.5313,195.4219 L194.3594,190.3438 Z M192.875,188.1094 L195.8594,188.1094 L199.2188,200.5 L196.7656,200.5 L196,197.4375 L192.7188,197.4375 L191.9688,200.5 L189.5313,200.5 L192.875,188.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="199.1543">Strategy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="217"/>
       <ellipse cx="115.5" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="124.5" y="225.2104">~Strategy() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="105.5" x2="345.5" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="110.5" y="237.8047"/>
       <ellipse cx="115.5" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="124.5" y="246.0151">algorithm() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="105.5" x2="345.5" y1="252.6094" y2="252.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffu4rmt1fhd7c)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkrke5mpsn7qi)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="322"/>
       <ellipse cx="34.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M37.4688,343.6406 Q36.8906,343.9375 36.25,344.0781 Q35.6094,344.2344 34.9063,344.2344 Q32.4063,344.2344 31.0781,342.5938 Q29.7656,340.9375 29.7656,337.8125 Q29.7656,334.6875 31.0781,333.0313 Q32.4063,331.375 34.9063,331.375 Q35.6094,331.375 36.25,331.5313 Q36.9063,331.6875 37.4688,331.9844 L37.4688,334.7031 Q36.8438,334.125 36.25,333.8594 Q35.6563,333.5781 35.0313,333.5781 Q33.6875,333.5781 33,334.6563 Q32.3125,335.7188 32.3125,337.8125 Q32.3125,339.9063 33,340.9844 Q33.6875,342.0469 35.0313,342.0469 Q35.6563,342.0469 36.25,341.7813 Q36.8438,341.5 37.4688,340.9219 L37.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="342.1543">StrategyA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360"/>
       <ellipse cx="17" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="128" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffu4rmt1fhd7c)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkrke5mpsn7qi)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="322"/>
       <ellipse cx="192.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.4688,343.6406 Q194.8906,343.9375 194.25,344.0781 Q193.6094,344.2344 192.9063,344.2344 Q190.4063,344.2344 189.0781,342.5938 Q187.7656,340.9375 187.7656,337.8125 Q187.7656,334.6875 189.0781,333.0313 Q190.4063,331.375 192.9063,331.375 Q193.6094,331.375 194.25,331.5313 Q194.9063,331.6875 195.4688,331.9844 L195.4688,334.7031 Q194.8438,334.125 194.25,333.8594 Q193.6563,333.5781 193.0313,333.5781 Q191.6875,333.5781 191,334.6563 Q190.3125,335.7188 190.3125,337.8125 Q190.3125,339.9063 191,340.9844 Q191.6875,342.0469 193.0313,342.0469 Q193.6563,342.0469 194.25,341.7813 Q194.8438,341.5 195.4688,340.9219 L195.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="342.1543">StrategyB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="170" y="360"/>
       <ellipse cx="175" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="286" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffu4rmt1fhd7c)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkrke5mpsn7qi)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="322"/>
       <ellipse cx="350.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M353.4688,343.6406 Q352.8906,343.9375 352.25,344.0781 Q351.6094,344.2344 350.9063,344.2344 Q348.4063,344.2344 347.0781,342.5938 Q345.7656,340.9375 345.7656,337.8125 Q345.7656,334.6875 347.0781,333.0313 Q348.4063,331.375 350.9063,331.375 Q351.6094,331.375 352.25,331.5313 Q352.9063,331.6875 353.4688,331.9844 L353.4688,334.7031 Q352.8438,334.125 352.25,333.8594 Q351.6563,333.5781 351.0313,333.5781 Q349.6875,333.5781 349,334.6563 Q348.3125,335.7188 348.3125,337.8125 Q348.3125,339.9063 349,340.9844 Q349.6875,342.0469 351.0313,342.0469 Q351.6563,342.0469 352.25,341.7813 Q352.8438,341.5 353.4688,340.9219 L353.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="342.1543">StrategyC</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="354" y2="354"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="328" y="360"/>
       <ellipse cx="333" cy="365" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="368.2104">algorithm() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="323" x2="444" y1="374.8047" y2="374.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffu4rmt1fhd7c)" height="94.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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkrke5mpsn7qi)" height="94.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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
       <ellipse cx="79" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="289" x="88" y="54.2104">Context(std::unique_ptr&lt;Strategy&gt; strategy) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="66.8047"/>
       <ellipse cx="79" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="88" y="75.0151">apply() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="89.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="95.8198">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
     </a>
     <path d="M161.3,274.03 C141.49,290.39 120.4,307.81 103.24,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg
index ba5b7751..4e46a57e 100644
--- a/docs/test_cases/t00023_class_mermaid.svg
+++ b/docs/test_cases/t00023_class_mermaid.svg
@@ -96,7 +96,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L6">
+        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L6">
           <g title="Strategy" id="classId-C_0001469857696438841976-0" class="node default clickable">
             <rect height="123" width="281.8125" y="-61.5" x="-140.90625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="140.90625" x1="-140.90625" class="divider"/>
@@ -125,7 +125,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L12">
+        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L12">
           <g title="StrategyA" id="classId-C_0001245533075819635385-1" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -149,7 +149,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L17">
+        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L17">
           <g title="StrategyB" id="classId-C_0000000264986406899645-2" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L22">
+        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L22">
           <g title="StrategyC" id="classId-C_0000174795176193483089-3" class="node default clickable">
             <rect height="79" width="143.5" y="-39.5" x="-71.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -197,7 +197,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00023/t00023.cc#L27">
+        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00023/t00023.cc#L27">
           <g title="Context" id="classId-C_0002038594012979479050-4" class="node default clickable">
             <rect height="123" width="300.046875" y="-61.5" x="-150.0234375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md
index e16bb8c6..7401f2a7 100644
--- a/docs/test_cases/t00024.md
+++ b/docs/test_cases/t00024.md
@@ -78,6 +78,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "~Target",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -100,10 +101,12 @@ private:
             "line": 8,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -126,10 +129,12 @@ private:
             "line": 10,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -152,6 +157,7 @@ private:
             "line": 11,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -186,6 +192,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -208,10 +215,12 @@ private:
             "line": 16,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -234,6 +243,7 @@ private:
             "line": 17,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -268,6 +278,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -290,10 +301,12 @@ private:
             "line": 22,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -316,6 +329,7 @@ private:
             "line": 23,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -363,6 +377,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "Proxy",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -390,10 +405,12 @@ private:
             "line": 28,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -416,10 +433,12 @@ private:
             "line": 32,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -442,6 +461,7 @@ private:
             "line": 33,
             "translation_unit": "t00024.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index 79ad7ce8..9739f6ee 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="297px" preserveAspectRatio="none" style="width:542px;height:297px;" version="1.1" viewBox="0 0 542 297" width="542px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbsmkzadua2h1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fa91xdj6jxg1x" 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,115 +9,115 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbsmkzadua2h1)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa91xdj6jxg1x)" height="94.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="136.5" y="8"/>
       <ellipse cx="181.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M181.8594,19.3438 L180.7031,24.4219 L183.0313,24.4219 L181.8594,19.3438 Z M180.375,17.1094 L183.3594,17.1094 L186.7188,29.5 L184.2656,29.5 L183.5,26.4375 L180.2188,26.4375 L179.4688,29.5 L177.0313,29.5 L180.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="202.25" y="28.1543">Target</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="46"/>
       <ellipse cx="147.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="156.5" y="54.2104">~Target() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="137.5" x2="275.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="66.8047"/>
       <ellipse cx="147.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="75.0151">m1() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142.5" y="79.6094"/>
       <ellipse cx="147.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="156.5" y="87.8198">m2() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="275.5" y1="94.4141" y2="94.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbsmkzadua2h1)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa91xdj6jxg1x)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="195.5"/>
       <ellipse cx="23.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,217.1406 Q26.0906,217.4375 25.45,217.5781 Q24.8094,217.7344 24.1063,217.7344 Q21.6063,217.7344 20.2781,216.0938 Q18.9656,214.4375 18.9656,211.3125 Q18.9656,208.1875 20.2781,206.5313 Q21.6063,204.875 24.1063,204.875 Q24.8094,204.875 25.45,205.0313 Q26.1063,205.1875 26.6688,205.4844 L26.6688,208.2031 Q26.0438,207.625 25.45,207.3594 Q24.8563,207.0781 24.2313,207.0781 Q22.8875,207.0781 22.2,208.1563 Q21.5125,209.2188 21.5125,211.3125 Q21.5125,213.4063 22.2,214.4844 Q22.8875,215.5469 24.2313,215.5469 Q24.8563,215.5469 25.45,215.2813 Q26.0438,215 26.6688,214.4219 L26.6688,217.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="215.6543">Target1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="227.5" y2="227.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="233.5"/>
       <ellipse cx="17" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="241.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="246.3047"/>
       <ellipse cx="17" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="254.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbsmkzadua2h1)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa91xdj6jxg1x)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="195.5"/>
       <ellipse cx="145.7" cy="211.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.6688,217.1406 Q148.0906,217.4375 147.45,217.5781 Q146.8094,217.7344 146.1063,217.7344 Q143.6063,217.7344 142.2781,216.0938 Q140.9656,214.4375 140.9656,211.3125 Q140.9656,208.1875 142.2781,206.5313 Q143.6063,204.875 146.1063,204.875 Q146.8094,204.875 147.45,205.0313 Q148.1063,205.1875 148.6688,205.4844 L148.6688,208.2031 Q148.0438,207.625 147.45,207.3594 Q146.8563,207.0781 146.2313,207.0781 Q144.8875,207.0781 144.2,208.1563 Q143.5125,209.2188 143.5125,211.3125 Q143.5125,213.4063 144.2,214.4844 Q144.8875,215.5469 146.2313,215.5469 Q146.8563,215.5469 147.45,215.2813 Q148.0438,215 148.6688,214.4219 L148.6688,217.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="215.6543">Target2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="227.5" y2="227.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="233.5"/>
       <ellipse cx="139" cy="238.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="241.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="246.3047"/>
       <ellipse cx="139" cy="251.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="254.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="261.1094" y2="261.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbsmkzadua2h1)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa91xdj6jxg1x)" height="107.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="179"/>
       <ellipse cx="369.75" cy="195" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M372.7188,200.6406 Q372.1406,200.9375 371.5,201.0781 Q370.8594,201.2344 370.1563,201.2344 Q367.6563,201.2344 366.3281,199.5938 Q365.0156,197.9375 365.0156,194.8125 Q365.0156,191.6875 366.3281,190.0313 Q367.6563,188.375 370.1563,188.375 Q370.8594,188.375 371.5,188.5313 Q372.1563,188.6875 372.7188,188.9844 L372.7188,191.7031 Q372.0938,191.125 371.5,190.8594 Q370.9063,190.5781 370.2813,190.5781 Q368.9375,190.5781 368.25,191.6563 Q367.5625,192.7188 367.5625,194.8125 Q367.5625,196.9063 368.25,197.9844 Q368.9375,199.0469 370.2813,199.0469 Q370.9063,199.0469 371.5,198.7813 Q372.0938,198.5 372.7188,197.9219 L372.7188,200.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="199.1543">Proxy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="217"/>
       <ellipse cx="261" cy="222" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="255" x="270" y="225.2104">Proxy(std::shared_ptr&lt;Target&gt; target) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="251" x2="530" y1="231.8047" y2="231.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="237.8047"/>
       <ellipse cx="261" cy="242.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="246.0151">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="250.6094"/>
       <ellipse cx="261" cy="255.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="270" y="258.8198">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="265.4141" y2="265.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="271.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="273.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="279.6245">m_target : std::shared_ptr&lt;Target&gt;</text>
     </a>
     <path d="M151.91,117.02 C128.52,143.17 102,172.81 81.81,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg
index 31d9e2d9..caa126e0 100644
--- a/docs/test_cases/t00024_class_mermaid.svg
+++ b/docs/test_cases/t00024_class_mermaid.svg
@@ -96,7 +96,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L6">
+        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L6">
           <g title="Target" id="classId-C_0001116408959993110019-0" class="node default clickable">
             <rect height="145" width="131.8125" y="-72.5" x="-65.90625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.90625" x1="-65.90625" class="divider"/>
@@ -130,7 +130,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L14">
+        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L14">
           <g title="Target1" id="classId-C_0000669517069151826610-1" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -159,7 +159,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L20">
+        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L20">
           <g title="Target2" id="classId-C_0001210513233906695933-2" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00024/t00024.cc#L26">
+        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00024/t00024.cc#L26">
           <g title="Proxy" id="classId-C_0000594707401639991215-3" class="node default clickable">
             <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md
index 03dc44e5..b254b348 100644
--- a/docs/test_cases/t00025.md
+++ b/docs/test_cases/t00025.md
@@ -76,6 +76,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -98,10 +99,12 @@ public:
             "line": 8,
             "translation_unit": "t00025.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -124,6 +127,7 @@ public:
             "line": 9,
             "translation_unit": "t00025.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -151,6 +155,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -173,10 +178,12 @@ public:
             "line": 14,
             "translation_unit": "t00025.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -199,6 +206,7 @@ public:
             "line": 15,
             "translation_unit": "t00025.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -239,6 +247,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "Proxy",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -266,10 +275,12 @@ public:
             "line": 20,
             "translation_unit": "t00025.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -292,10 +303,12 @@ public:
             "line": 24,
             "translation_unit": "t00025.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "m2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -318,6 +331,7 @@ public:
             "line": 25,
             "translation_unit": "t00025.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -363,7 +377,7 @@ public:
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00025::Target1"
+          "type": "Target1"
         }
       ],
       "type": "class"
@@ -392,7 +406,7 @@ public:
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00025::Target2"
+          "type": "Target2"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index aed0173e..df76699f 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="386px" preserveAspectRatio="none" style="width:512px;height:386px;" version="1.1" viewBox="0 0 512 386" width="512px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1rk6i3opdfyal" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1u7axsqrjib4t" 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,52 +9,52 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rk6i3opdfyal)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1u7axsqrjib4t)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="284.5"/>
       <ellipse cx="23.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,306.1406 Q26.0906,306.4375 25.45,306.5781 Q24.8094,306.7344 24.1063,306.7344 Q21.6063,306.7344 20.2781,305.0938 Q18.9656,303.4375 18.9656,300.3125 Q18.9656,297.1875 20.2781,295.5313 Q21.6063,293.875 24.1063,293.875 Q24.8094,293.875 25.45,294.0313 Q26.1063,294.1875 26.6688,294.4844 L26.6688,297.2031 Q26.0438,296.625 25.45,296.3594 Q24.8563,296.0781 24.2313,296.0781 Q22.8875,296.0781 22.2,297.1563 Q21.5125,298.2188 21.5125,300.3125 Q21.5125,302.4063 22.2,303.4844 Q22.8875,304.5469 24.2313,304.5469 Q24.8563,304.5469 25.45,304.2813 Q26.0438,304 26.6688,303.4219 L26.6688,306.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="304.6543">Target1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="316.5" y2="316.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="322.5"/>
       <ellipse cx="17" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="330.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="335.3047"/>
       <ellipse cx="17" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="343.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rk6i3opdfyal)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1u7axsqrjib4t)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="414" y="284.5"/>
       <ellipse cx="431.7" cy="300.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M434.6688,306.1406 Q434.0906,306.4375 433.45,306.5781 Q432.8094,306.7344 432.1063,306.7344 Q429.6063,306.7344 428.2781,305.0938 Q426.9656,303.4375 426.9656,300.3125 Q426.9656,297.1875 428.2781,295.5313 Q429.6063,293.875 432.1063,293.875 Q432.8094,293.875 433.45,294.0313 Q434.1063,294.1875 434.6688,294.4844 L434.6688,297.2031 Q434.0438,296.625 433.45,296.3594 Q432.8563,296.0781 432.2313,296.0781 Q430.8875,296.0781 430.2,297.1563 Q429.5125,298.2188 429.5125,300.3125 Q429.5125,302.4063 430.2,303.4844 Q430.8875,304.5469 432.2313,304.5469 Q432.8563,304.5469 433.45,304.2813 Q434.0438,304 434.6688,303.4219 L434.6688,306.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="446.3" y="304.6543">Target2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="316.5" y2="316.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="322.5"/>
       <ellipse cx="425" cy="327.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="330.7104">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="420" y="335.3047"/>
       <ellipse cx="425" cy="340.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="434" y="343.5151">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="415" x2="500" y1="350.1094" y2="350.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rk6i3opdfyal)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1u7axsqrjib4t)" height="107.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="251" x="128" y="268"/>
       <ellipse cx="227.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.2188,289.6406 Q229.6406,289.9375 229,290.0781 Q228.3594,290.2344 227.6563,290.2344 Q225.1563,290.2344 223.8281,288.5938 Q222.5156,286.9375 222.5156,283.8125 Q222.5156,280.6875 223.8281,279.0313 Q225.1563,277.375 227.6563,277.375 Q228.3594,277.375 229,277.5313 Q229.6563,277.6875 230.2188,277.9844 L230.2188,280.7031 Q229.5938,280.125 229,279.8594 Q228.4063,279.5781 227.7813,279.5781 Q226.4375,279.5781 225.75,280.6563 Q225.0625,281.7188 225.0625,283.8125 Q225.0625,285.9063 225.75,286.9844 Q226.4375,288.0469 227.7813,288.0469 Q228.4063,288.0469 229,287.7813 Q229.5938,287.5 230.2188,286.9219 L230.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="247.75" y="288.1543">Proxy</text>
@@ -62,38 +62,38 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="374" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="306"/>
       <ellipse cx="139" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="148" y="314.2104">Proxy(std::shared_ptr&lt;T&gt; target) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="129" x2="378" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="326.8047"/>
       <ellipse cx="139" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="335.0151">m1() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="339.6094"/>
       <ellipse cx="139" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="347.8198">m2() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="378" y1="354.4141" y2="354.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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" y="360.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136" y="362.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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" y="368.6245">m_target : std::shared_ptr&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rk6i3opdfyal)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1u7axsqrjib4t)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="90.5" y="159"/>
       <ellipse cx="105.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M108.4688,180.6406 Q107.8906,180.9375 107.25,181.0781 Q106.6094,181.2344 105.9063,181.2344 Q103.4063,181.2344 102.0781,179.5938 Q100.7656,177.9375 100.7656,174.8125 Q100.7656,171.6875 102.0781,170.0313 Q103.4063,168.375 105.9063,168.375 Q106.6094,168.375 107.25,168.5313 Q107.9063,168.6875 108.4688,168.9844 L108.4688,171.7031 Q107.8438,171.125 107.25,170.8594 Q106.6563,170.5781 106.0313,170.5781 Q104.6875,170.5781 104,171.6563 Q103.3125,172.7188 103.3125,174.8125 Q103.3125,176.9063 104,177.9844 Q104.6875,179.0469 106.0313,179.0469 Q106.6563,179.0469 107.25,178.7813 Q107.8438,178.5 108.4688,177.9219 L108.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="119.5" y="179.1543">Proxy</text>
@@ -102,8 +102,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91.5" x2="207.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91.5" x2="207.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rk6i3opdfyal)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1u7axsqrjib4t)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="243.5" y="159"/>
       <ellipse cx="258.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M261.4688,180.6406 Q260.8906,180.9375 260.25,181.0781 Q259.6094,181.2344 258.9063,181.2344 Q256.4063,181.2344 255.0781,179.5938 Q253.7656,177.9375 253.7656,174.8125 Q253.7656,171.6875 255.0781,170.0313 Q256.4063,168.375 258.9063,168.375 Q259.6094,168.375 260.25,168.5313 Q260.9063,168.6875 261.4688,168.9844 L261.4688,171.7031 Q260.8438,171.125 260.25,170.8594 Q259.6563,170.5781 259.0313,170.5781 Q257.6875,170.5781 257,171.6563 Q256.3125,172.7188 256.3125,174.8125 Q256.3125,176.9063 257,177.9844 Q257.6875,179.0469 259.0313,179.0469 Q259.6563,179.0469 260.25,178.7813 Q260.8438,178.5 261.4688,177.9219 L261.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="272.5" y="179.1543">Proxy</text>
@@ -112,26 +112,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244.5" x2="360.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244.5" x2="360.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rk6i3opdfyal)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1u7axsqrjib4t)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="141" y="8"/>
       <ellipse cx="184.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M187.3188,29.6406 Q186.7406,29.9375 186.1,30.0781 Q185.4594,30.2344 184.7563,30.2344 Q182.2563,30.2344 180.9281,28.5938 Q179.6156,26.9375 179.6156,23.8125 Q179.6156,20.6875 180.9281,19.0313 Q182.2563,17.375 184.7563,17.375 Q185.4594,17.375 186.1,17.5313 Q186.7563,17.6875 187.3188,17.9844 L187.3188,20.7031 Q186.6938,20.125 186.1,19.8594 Q185.5063,19.5781 184.8813,19.5781 Q183.5375,19.5781 182.85,20.6563 Q182.1625,21.7188 182.1625,23.8125 Q182.1625,25.9063 182.85,26.9844 Q183.5375,28.0469 184.8813,28.0469 Q185.5063,28.0469 186.1,27.7813 Q186.6938,27.5 187.3188,26.9219 L187.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="204.65" y="28.1543">ProxyHolder</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="142" x2="309" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="147" y="54"/>
       <ellipse cx="152" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="161" y="62.2104">proxy1 : Proxy&lt;Target1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="147" y="66.8047"/>
       <ellipse cx="152" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="161" y="75.0151">proxy2 : Proxy&lt;Target2&gt;</text>
     </a>
     <path d="M132.54,207.16 C117.89,227.14 96.41,256.47 78.96,280.29 " fill="none" id="C_0001644966842838139424-&gt;C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg
index 9891644e..2c8f0336 100644
--- a/docs/test_cases/t00025_class_mermaid.svg
+++ b/docs/test_cases/t00025_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L6">
+        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L6">
           <g title="Target1" id="classId-C_0001573849034571194138-0" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -155,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L12">
+        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L12">
           <g title="Target2" id="classId-C_0000751896409461834669-1" class="node default clickable">
             <rect height="101" width="99.921875" y="-50.5" x="-49.9609375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -184,7 +184,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18">
+        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001483353300536405088-2" class="node default clickable">
             <rect height="145" width="270.671875" y="-72.5" x="-135.3359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18">
+        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001644966842838139424-3" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -242,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L18">
+        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L18">
           <g title="Proxy" id="classId-C_0001190103100236298763-4" class="node default clickable">
             <rect height="57" width="134.765625" y="-28.5" x="-67.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -261,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00025/t00025.cc#L31">
+        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00025/t00025.cc#L31">
           <g title="ProxyHolder" id="classId-C_0001906317303950647748-5" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md
index e0e52803..1123fb8f 100644
--- a/docs/test_cases/t00026.md
+++ b/docs/test_cases/t00026.md
@@ -110,6 +110,7 @@ struct StringMemento {
       "methods": [
         {
           "access": "public",
+          "display_name": "Memento",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -137,10 +138,12 @@ struct StringMemento {
             "line": 10,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "value",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -163,6 +166,7 @@ struct StringMemento {
             "line": 15,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "T"
         }
       ],
@@ -210,6 +214,7 @@ struct StringMemento {
       "methods": [
         {
           "access": "public",
+          "display_name": "Originator",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -237,10 +242,12 @@ struct StringMemento {
             "line": 23,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "memoize_value",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -263,10 +270,12 @@ struct StringMemento {
             "line": 28,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "Memento<T>"
         },
         {
           "access": "public",
+          "display_name": "load",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -294,10 +303,12 @@ struct StringMemento {
             "line": 30,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "print",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -320,10 +331,12 @@ struct StringMemento {
             "line": 32,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "set",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -351,6 +364,7 @@ struct StringMemento {
             "line": 34,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -398,6 +412,7 @@ struct StringMemento {
       "methods": [
         {
           "access": "public",
+          "display_name": "state",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -425,10 +440,12 @@ struct StringMemento {
             "line": 42,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "Memento<T> &"
         },
         {
           "access": "public",
+          "display_name": "set_state",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -460,6 +477,7 @@ struct StringMemento {
             "line": 44,
             "translation_unit": "t00026.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index 8103e2c5..2c083dca 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="583px" preserveAspectRatio="none" style="width:690px;height:583px;" version="1.1" viewBox="0 0 690 583" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1az7csrkgran9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1xhl0rodd1ott" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1az7csrkgran9)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xhl0rodd1ott)" height="94.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="324" y="478"/>
       <ellipse cx="366.45" cy="494" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M369.4188,499.6406 Q368.8406,499.9375 368.2,500.0781 Q367.5594,500.2344 366.8563,500.2344 Q364.3563,500.2344 363.0281,498.5938 Q361.7156,496.9375 361.7156,493.8125 Q361.7156,490.6875 363.0281,489.0313 Q364.3563,487.375 366.8563,487.375 Q367.5594,487.375 368.2,487.5313 Q368.8563,487.6875 369.4188,487.9844 L369.4188,490.7031 Q368.7938,490.125 368.2,489.8594 Q367.6063,489.5781 366.9813,489.5781 Q365.6375,489.5781 364.95,490.6563 Q364.2625,491.7188 364.2625,493.8125 Q364.2625,495.9063 364.95,496.9844 Q365.6375,498.0469 366.9813,498.0469 Q367.6063,498.0469 368.2,497.7813 Q368.7938,497.5 369.4188,496.9219 L369.4188,499.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="386.55" y="498.1543">Memento</text>
@@ -18,31 +18,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="481" y="487.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="510" y2="510"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="516"/>
       <ellipse cx="335" cy="521" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="344" y="524.2104">Memento(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="325" x2="485" y1="530.8047" y2="530.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="330" y="536.8047"/>
       <ellipse cx="335" cy="541.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="344" y="545.0151">value() const : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="325" x2="485" y1="551.6094" y2="551.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="330" y="557.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="332" y="559.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="344" y="565.8198">m_value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1az7csrkgran9)" height="132.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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xhl0rodd1ott)" height="132.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>
@@ -50,52 +50,52 @@
       <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
       <ellipse cx="442.5" cy="311" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="451.5" y="314.2104">Originator(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="326.8047"/>
       <ellipse cx="442.5" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="451.5" y="335.0151">load(const Memento&lt;T&gt; &amp; m) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="339.6094"/>
       <ellipse cx="442.5" cy="344.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="451.5" y="347.8198">memoize_value() const : Memento&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="352.4141"/>
       <ellipse cx="442.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="360.6245">print() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="365.2188"/>
       <ellipse cx="442.5" cy="370.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="373.4292">set(T &amp;&amp; v) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="380.0234" y2="380.0234"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="386.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="388.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="394.2339">m_value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1az7csrkgran9)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xhl0rodd1ott)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="291.5"/>
       <ellipse cx="160.25" cy="307.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.2188,313.1406 Q162.6406,313.4375 162,313.5781 Q161.3594,313.7344 160.6563,313.7344 Q158.1563,313.7344 156.8281,312.0938 Q155.5156,310.4375 155.5156,307.3125 Q155.5156,304.1875 156.8281,302.5313 Q158.1563,300.875 160.6563,300.875 Q161.3594,300.875 162,301.0313 Q162.6563,301.1875 163.2188,301.4844 L163.2188,304.2031 Q162.5938,303.625 162,303.3594 Q161.4063,303.0781 160.7813,303.0781 Q159.4375,303.0781 158.75,304.1563 Q158.0625,305.2188 158.0625,307.3125 Q158.0625,309.4063 158.75,310.4844 Q159.4375,311.5469 160.7813,311.5469 Q161.4063,311.5469 162,311.2813 Q162.5938,311 163.2188,310.4219 L163.2188,313.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="311.6543">Caretaker</text>
@@ -103,30 +103,30 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="300.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="323.5" y2="323.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="329.5"/>
       <ellipse cx="17" cy="334.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="337.7104">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="342.3047"/>
       <ellipse cx="17" cy="347.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="350.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="357.1094" y2="357.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="363.1094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="365.1094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="371.3198">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1az7csrkgran9)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xhl0rodd1ott)" 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>
@@ -135,8 +135,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1az7csrkgran9)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xhl0rodd1ott)" 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>
@@ -145,26 +145,26 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1az7csrkgran9)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xhl0rodd1ott)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="313.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">caretaker : Caretaker&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="313.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">originator : Originator&lt;std::string&gt;</text>
     </a>
     <path d="M502.1,401.16 C483.28,424.97 462.34,451.46 444.73,473.73 " fill="none" id="C_0001324770803720816727-&gt;C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg
index 7450ec37..b38e37ad 100644
--- a/docs/test_cases/t00026_class_mermaid.svg
+++ b/docs/test_cases/t00026_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L8">
+        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L8">
           <g title="Memento" id="classId-C_0001241204213727905390-0" class="node default clickable">
             <rect height="123" width="192.109375" y="-61.5" x="-96.0546875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
@@ -160,7 +160,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001324770803720816727-1" class="node default clickable">
             <rect height="189" width="307.125" y="-94.5" x="-153.5625" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="153.5625" x1="-153.5625" class="divider"/>
@@ -209,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0002032715387182792204-2" class="node default clickable">
             <rect height="123" width="461.4375" y="-61.5" x="-230.71875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="230.71875" x1="-230.71875" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L40">
+        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L40">
           <g title="Caretaker" id="classId-C_0001708482137721157489-3" class="node default clickable">
             <rect height="57" width="186.625" y="-28.5" x="-93.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="93.3125" x1="-93.3125" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L21">
+        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L21">
           <g title="Originator" id="classId-C_0001014247960805363560-4" class="node default clickable">
             <rect height="57" width="190.125" y="-28.5" x="-95.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.0625" x1="-95.0625" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00026/t00026.cc#L53">
+        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00026/t00026.cc#L53">
           <g title="StringMemento" id="classId-C_0000851750942915129289-5" class="node default clickable">
             <rect height="101" width="262.6875" y="-50.5" x="-131.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="131.34375" x1="-131.34375" class="divider"/>
diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md
index e31c4b8a..863942b9 100644
--- a/docs/test_cases/t00027.md
+++ b/docs/test_cases/t00027.md
@@ -94,6 +94,7 @@ struct Window {
       "methods": [
         {
           "access": "public",
+          "display_name": "display",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -116,10 +117,12 @@ struct Window {
             "line": 10,
             "translation_unit": "t00027.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "~Shape",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -142,6 +145,7 @@ struct Window {
             "line": 11,
             "translation_unit": "t00027.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -204,6 +208,7 @@ struct Window {
       "methods": [
         {
           "access": "public",
+          "display_name": "display",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -226,6 +231,7 @@ struct Window {
             "line": 17,
             "translation_unit": "t00027.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -295,6 +301,7 @@ struct Window {
       "methods": [
         {
           "access": "public",
+          "display_name": "display",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -317,6 +324,7 @@ struct Window {
             "line": 27,
             "translation_unit": "t00027.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -351,6 +359,7 @@ struct Window {
       "methods": [
         {
           "access": "public",
+          "display_name": "display",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -373,6 +382,7 @@ struct Window {
             "line": 35,
             "translation_unit": "t00027.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -407,6 +417,7 @@ struct Window {
       "methods": [
         {
           "access": "public",
+          "display_name": "display",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -429,6 +440,7 @@ struct Window {
             "line": 40,
             "translation_unit": "t00027.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -470,6 +482,7 @@ struct Window {
       "methods": [
         {
           "access": "public",
+          "display_name": "display",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -492,6 +505,7 @@ struct Window {
             "line": 45,
             "translation_unit": "t00027.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -661,7 +675,7 @@ struct Window {
             "line": 49,
             "translation_unit": "t00027.cc"
           },
-          "type": "Line<clanguml::t00027::Color,clanguml::t00027::Weight>"
+          "type": "Line<Color,Weight>"
         },
         {
           "access": "public",
@@ -673,7 +687,7 @@ struct Window {
             "line": 50,
             "translation_unit": "t00027.cc"
           },
-          "type": "Line<clanguml::t00027::Color>"
+          "type": "Line<Color>"
         },
         {
           "access": "public",
@@ -685,7 +699,7 @@ struct Window {
             "line": 51,
             "translation_unit": "t00027.cc"
           },
-          "type": "Text<clanguml::t00027::Color,clanguml::t00027::Weight>"
+          "type": "Text<Color,Weight>"
         },
         {
           "access": "public",
@@ -697,7 +711,7 @@ struct Window {
             "line": 52,
             "translation_unit": "t00027.cc"
           },
-          "type": "Text<clanguml::t00027::Color>"
+          "type": "Text<Color>"
         }
       ],
       "methods": [],
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index 4a48e6f6..a969c41c 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="398px" preserveAspectRatio="none" style="width:1289px;height:398px;" version="1.1" viewBox="0 0 1289 398" width="1289px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fjl5zdijwwoq2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fi9p1hz5347g2" 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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="81.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="310.5" y="184"/>
       <ellipse cx="401.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.3594,195.3438 L400.2031,200.4219 L402.5313,200.4219 L401.3594,195.3438 Z M399.875,193.1094 L402.8594,193.1094 L406.2188,205.5 L403.7656,205.5 L403,202.4375 L399.7188,202.4375 L398.9688,205.5 L396.5313,205.5 L399.875,193.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="421.75" y="204.1543">Shape</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="222"/>
       <ellipse cx="321.5" cy="227" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="330.5" y="230.2104">~Shape() constexpr = default : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="311.5" x2="539.5" y1="236.8047" y2="236.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="316.5" y="242.8047"/>
       <ellipse cx="321.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="330.5" y="251.0151">display() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311.5" x2="539.5" y1="257.6094" y2="257.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="764" y="33.5"/>
       <ellipse cx="779" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M781.9688,55.1406 Q781.3906,55.4375 780.75,55.5781 Q780.1094,55.7344 779.4063,55.7344 Q776.9063,55.7344 775.5781,54.0938 Q774.2656,52.4375 774.2656,49.3125 Q774.2656,46.1875 775.5781,44.5313 Q776.9063,42.875 779.4063,42.875 Q780.1094,42.875 780.75,43.0313 Q781.4063,43.1875 781.9688,43.4844 L781.9688,46.2031 Q781.3438,45.625 780.75,45.3594 Q780.1563,45.0781 779.5313,45.0781 Q778.1875,45.0781 777.5,46.1563 Q776.8125,47.2188 776.8125,49.3125 Q776.8125,51.4063 777.5,52.4844 Q778.1875,53.5469 779.5313,53.5469 Q780.1563,53.5469 780.75,53.2813 Q781.3438,53 781.9688,52.4219 L781.9688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="793" y="53.6543">Line</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="765" x2="820" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="150" y="327"/>
       <ellipse cx="169.05" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M172.0188,348.6406 Q171.4406,348.9375 170.8,349.0781 Q170.1594,349.2344 169.4563,349.2344 Q166.9563,349.2344 165.6281,347.5938 Q164.3156,345.9375 164.3156,342.8125 Q164.3156,339.6875 165.6281,338.0313 Q166.9563,336.375 169.4563,336.375 Q170.1594,336.375 170.8,336.5313 Q171.4563,336.6875 172.0188,336.9844 L172.0188,339.7031 Q171.3938,339.125 170.8,338.8594 Q170.2063,338.5781 169.5813,338.5781 Q168.2375,338.5781 167.55,339.6563 Q166.8625,340.7188 166.8625,342.8125 Q166.8625,344.9063 167.55,345.9844 Q168.2375,347.0469 169.5813,347.0469 Q170.2063,347.0469 170.8,346.7813 Q171.3938,346.5 172.0188,345.9219 L172.0188,348.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="183.95" y="347.1543">Line</text>
@@ -49,24 +49,24 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="222" y="336.1387">T&lt;&gt;...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="156" y="365"/>
       <ellipse cx="161" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="170" y="373.2104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="151" x2="258" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="943.5" y="33.5"/>
       <ellipse cx="958.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M961.4688,55.1406 Q960.8906,55.4375 960.25,55.5781 Q959.6094,55.7344 958.9063,55.7344 Q956.4063,55.7344 955.0781,54.0938 Q953.7656,52.4375 953.7656,49.3125 Q953.7656,46.1875 955.0781,44.5313 Q956.4063,42.875 958.9063,42.875 Q959.6094,42.875 960.25,43.0313 Q960.9063,43.1875 961.4688,43.4844 L961.4688,46.2031 Q960.8438,45.625 960.25,45.3594 Q959.6563,45.0781 959.0313,45.0781 Q957.6875,45.0781 957,46.1563 Q956.3125,47.2188 956.3125,49.3125 Q956.3125,51.4063 957,52.4844 Q957.6875,53.5469 959.0313,53.5469 Q959.6563,53.5469 960.25,53.2813 Q960.8438,53 961.4688,52.4219 L961.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="972.5" y="53.6543">Text</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="944.5" x2="1000.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="592" y="327"/>
       <ellipse cx="610.6" cy="343" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.5688,348.6406 Q612.9906,348.9375 612.35,349.0781 Q611.7094,349.2344 611.0063,349.2344 Q608.5063,349.2344 607.1781,347.5938 Q605.8656,345.9375 605.8656,342.8125 Q605.8656,339.6875 607.1781,338.0313 Q608.5063,336.375 611.0063,336.375 Q611.7094,336.375 612.35,336.5313 Q613.0063,336.6875 613.5688,336.9844 L613.5688,339.7031 Q612.9438,339.125 612.35,338.8594 Q611.7563,338.5781 611.1313,338.5781 Q609.7875,338.5781 609.1,339.6563 Q608.4125,340.7188 608.4125,342.8125 Q608.4125,344.9063 609.1,345.9844 Q609.7875,347.0469 611.1313,347.0469 Q611.7563,347.0469 612.35,346.7813 Q612.9438,346.5 613.5688,345.9219 L613.5688,348.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="625.4" y="347.1543">Text</text>
@@ -74,31 +74,31 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="664" y="336.1387">T&lt;&gt;...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="359" y2="359"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598" y="365"/>
       <ellipse cx="603" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="612" y="373.2104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="593" x2="700" y1="379.8047" y2="379.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1081" y="27"/>
       <ellipse cx="1096" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1096.1094,38.3438 L1094.9531,43.4219 L1097.2813,43.4219 L1096.1094,38.3438 Z M1094.625,36.1094 L1097.6094,36.1094 L1100.9688,48.5 L1098.5156,48.5 L1097.75,45.4375 L1094.4688,45.4375 L1093.7188,48.5 L1091.2813,48.5 L1094.625,36.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1110" y="47.1543">ShapeDecorator</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="59" y2="59"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1087" y="65"/>
       <ellipse cx="1092" cy="70" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1101" y="73.2104">display() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1082" x2="1215" y1="79.8047" y2="79.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1022" y="194.5"/>
       <ellipse cx="1052.3" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1055.2688,216.1406 Q1054.6906,216.4375 1054.05,216.5781 Q1053.4094,216.7344 1052.7063,216.7344 Q1050.2063,216.7344 1048.8781,215.0938 Q1047.5656,213.4375 1047.5656,210.3125 Q1047.5656,207.1875 1048.8781,205.5313 Q1050.2063,203.875 1052.7063,203.875 Q1053.4094,203.875 1054.05,204.0313 Q1054.7063,204.1875 1055.2688,204.4844 L1055.2688,207.2031 Q1054.6438,206.625 1054.05,206.3594 Q1053.4563,206.0781 1052.8313,206.0781 Q1051.4875,206.0781 1050.8,207.1563 Q1050.1125,208.2188 1050.1125,210.3125 Q1050.1125,212.4063 1050.8,213.4844 Q1051.4875,214.5469 1052.8313,214.5469 Q1053.4563,214.5469 1054.05,214.2813 Q1054.6438,214 1055.2688,213.4219 L1055.2688,216.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1069.7" y="214.6543">Color</text>
@@ -106,16 +106,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1126" y="203.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="226.5" y2="226.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1028" y="232.5"/>
       <ellipse cx="1033" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1042" y="240.7104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1023" x2="1130" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1166" y="194.5"/>
       <ellipse cx="1191.35" cy="210.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1194.3188,216.1406 Q1193.7406,216.4375 1193.1,216.5781 Q1192.4594,216.7344 1191.7563,216.7344 Q1189.2563,216.7344 1187.9281,215.0938 Q1186.6156,213.4375 1186.6156,210.3125 Q1186.6156,207.1875 1187.9281,205.5313 Q1189.2563,203.875 1191.7563,203.875 Q1192.4594,203.875 1193.1,204.0313 Q1193.7563,204.1875 1194.3188,204.4844 L1194.3188,207.2031 Q1193.6938,206.625 1193.1,206.3594 Q1192.5063,206.0781 1191.8813,206.0781 Q1190.5375,206.0781 1189.85,207.1563 Q1189.1625,208.2188 1189.1625,210.3125 Q1189.1625,212.4063 1189.85,213.4844 Q1190.5375,214.5469 1191.8813,214.5469 Q1192.5063,214.5469 1193.1,214.2813 Q1193.6938,214 1194.3188,213.4219 L1194.3188,216.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1207.65" y="214.6543">Weight</text>
@@ -123,16 +123,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1270" y="203.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="226.5" y2="226.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1172" y="232.5"/>
       <ellipse cx="1177" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1186" y="240.7104">display() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1167" x2="1274" y1="247.3047" y2="247.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="134" y="201"/>
       <ellipse cx="149" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M151.9688,222.6406 Q151.3906,222.9375 150.75,223.0781 Q150.1094,223.2344 149.4063,223.2344 Q146.9063,223.2344 145.5781,221.5938 Q144.2656,219.9375 144.2656,216.8125 Q144.2656,213.6875 145.5781,212.0313 Q146.9063,210.375 149.4063,210.375 Q150.1094,210.375 150.75,210.5313 Q151.4063,210.6875 151.9688,210.9844 L151.9688,213.7031 Q151.3438,213.125 150.75,212.8594 Q150.1563,212.5781 149.5313,212.5781 Q148.1875,212.5781 147.5,213.6563 Q146.8125,214.7188 146.8125,216.8125 Q146.8125,218.9063 147.5,219.9844 Q148.1875,221.0469 149.5313,221.0469 Q150.1563,221.0469 150.75,220.7813 Q151.3438,220.5 151.9688,219.9219 L151.9688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="221.1543">Line</text>
@@ -141,8 +141,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="274" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="201"/>
       <ellipse cx="21" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,222.6406 Q23.3906,222.9375 22.75,223.0781 Q22.1094,223.2344 21.4063,223.2344 Q18.9063,223.2344 17.5781,221.5938 Q16.2656,219.9375 16.2656,216.8125 Q16.2656,213.6875 17.5781,212.0313 Q18.9063,210.375 21.4063,210.375 Q22.1094,210.375 22.75,210.5313 Q23.4063,210.6875 23.9688,210.9844 L23.9688,213.7031 Q23.3438,213.125 22.75,212.8594 Q22.1563,212.5781 21.5313,212.5781 Q20.1875,212.5781 19.5,213.6563 Q18.8125,214.7188 18.8125,216.8125 Q18.8125,218.9063 19.5,219.9844 Q20.1875,221.0469 21.5313,221.0469 Q22.1563,221.0469 22.75,220.7813 Q23.3438,220.5 23.9688,219.9219 L23.9688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="221.1543">Line</text>
@@ -151,8 +151,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="575.5" y="201"/>
       <ellipse cx="590.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M593.4688,222.6406 Q592.8906,222.9375 592.25,223.0781 Q591.6094,223.2344 590.9063,223.2344 Q588.4063,223.2344 587.0781,221.5938 Q585.7656,219.9375 585.7656,216.8125 Q585.7656,213.6875 587.0781,212.0313 Q588.4063,210.375 590.9063,210.375 Q591.6094,210.375 592.25,210.5313 Q592.9063,210.6875 593.4688,210.9844 L593.4688,213.7031 Q592.8438,213.125 592.25,212.8594 Q591.6563,212.5781 591.0313,212.5781 Q589.6875,212.5781 589,213.6563 Q588.3125,214.7188 588.3125,216.8125 Q588.3125,218.9063 589,219.9844 Q589.6875,221.0469 591.0313,221.0469 Q591.6563,221.0469 592.25,220.7813 Q592.8438,220.5 593.4688,219.9219 L593.4688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="604.5" y="221.1543">Text</text>
@@ -161,8 +161,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="576.5" x2="716.5" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="752.5" y="201"/>
       <ellipse cx="767.5" cy="217" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M770.4688,222.6406 Q769.8906,222.9375 769.25,223.0781 Q768.6094,223.2344 767.9063,223.2344 Q765.4063,223.2344 764.0781,221.5938 Q762.7656,219.9375 762.7656,216.8125 Q762.7656,213.6875 764.0781,212.0313 Q765.4063,210.375 767.9063,210.375 Q768.6094,210.375 769.25,210.5313 Q769.9063,210.6875 770.4688,210.9844 L770.4688,213.7031 Q769.8438,213.125 769.25,212.8594 Q768.6563,212.5781 768.0313,212.5781 Q766.6875,212.5781 766,213.6563 Q765.3125,214.7188 765.3125,216.8125 Q765.3125,218.9063 766,219.9844 Q766.6875,221.0469 768.0313,221.0469 Q768.6563,221.0469 769.25,220.7813 Q769.8438,220.5 770.4688,219.9219 L770.4688,222.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="781.5" y="221.1543">Text</text>
@@ -171,40 +171,40 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="233" y2="233"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="753.5" x2="845.5" y1="241" y2="241"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl5zdijwwoq2)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fi9p1hz5347g2)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="366.5" y="8"/>
       <ellipse cx="432.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M435.7188,29.6406 Q435.1406,29.9375 434.5,30.0781 Q433.8594,30.2344 433.1563,30.2344 Q430.6563,30.2344 429.3281,28.5938 Q428.0156,26.9375 428.0156,23.8125 Q428.0156,20.6875 429.3281,19.0313 Q430.6563,17.375 433.1563,17.375 Q433.8594,17.375 434.5,17.5313 Q435.1563,17.6875 435.7188,17.9844 L435.7188,20.7031 Q435.0938,20.125 434.5,19.8594 Q433.9063,19.5781 433.2813,19.5781 Q431.9375,19.5781 431.25,20.6563 Q430.5625,21.7188 430.5625,23.8125 Q430.5625,25.9063 431.25,26.9844 Q431.9375,28.0469 433.2813,28.0469 Q433.9063,28.0469 434.5,27.7813 Q435.0938,27.5 435.7188,26.9219 L435.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="453.25" y="28.1543">Window</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="553.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="372.5" y="54"/>
       <ellipse cx="377.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="386.5" y="62.2104">border : Line&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="372.5" y="66.8047"/>
       <ellipse cx="377.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="386.5" y="75.0151">description : Text&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="372.5" y="79.6094"/>
       <ellipse cx="377.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="386.5" y="87.8198">divider : Line&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="372.5" y="92.4141"/>
       <ellipse cx="377.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="386.5" y="100.6245">title : Text&lt;Color,Weight&gt;</text>
     </a>
     <path d="M340.09,276.44 C311.19,293.5 279.87,311.99 254.63,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg
index 12291553..d0b46a91 100644
--- a/docs/test_cases/t00027_class_mermaid.svg
+++ b/docs/test_cases/t00027_class_mermaid.svg
@@ -190,7 +190,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L8">
+        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L8">
           <g title="Shape" id="classId-C_0001593092483959332221-0" class="node default clickable">
             <rect height="123" width="268.484375" y="-61.5" x="-134.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15">
+        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0001568932879061562228-1" class="node default clickable">
             <rect height="57" width="47.890625" y="-28.5" x="-23.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.9453125" x1="-23.9453125" class="divider"/>
@@ -238,7 +238,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000142374082478337852-2" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25">
+        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001833467466291294724-3" class="node default clickable">
             <rect height="57" width="46.71875" y="-28.5" x="-23.359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="23.359375" x1="-23.359375" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001114634647721878603-4" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -305,7 +305,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L34">
+        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L34">
           <g title="ShapeDecorator" id="classId-C_0002049188825706164566-5" class="node default clickable">
             <rect height="101" width="138.59375" y="-50.5" x="-69.296875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="69.296875" x1="-69.296875" class="divider"/>
@@ -329,7 +329,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L38">
+        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L38">
           <g title="Color" id="classId-C_0001473536569433029444-6" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -353,7 +353,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L43">
+        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L43">
           <g title="Weight" id="classId-C_0002049455532387561338-7" class="node default clickable">
             <rect height="79" width="127.5" y="-39.5" x="-63.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -377,7 +377,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15">
+        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0002082936326417164202-8" class="node default clickable">
             <rect height="57" width="164.953125" y="-28.5" x="-82.4765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.4765625" x1="-82.4765625" class="divider"/>
@@ -396,7 +396,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L15">
+        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L15">
           <g title="Line" id="classId-C_0000675132943535054947-9" class="node default clickable">
             <rect height="57" width="108.359375" y="-28.5" x="-54.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="54.1796875" x1="-54.1796875" class="divider"/>
@@ -415,7 +415,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001678874302644303776-10" class="node default clickable">
             <rect height="57" width="163.765625" y="-28.5" x="-81.8828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.8828125" x1="-81.8828125" class="divider"/>
@@ -434,7 +434,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L25">
+        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L25">
           <g title="Text" id="classId-C_0001887786688778664182-11" class="node default clickable">
             <rect height="57" width="107.171875" y="-28.5" x="-53.5859375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="53.5859375" x1="-53.5859375" class="divider"/>
@@ -453,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00027/t00027.cc#L48">
+        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00027/t00027.cc#L48">
           <g title="Window" id="classId-C_0001373544984027721472-12" class="node default clickable">
             <rect height="145" width="224.171875" y="-72.5" x="-112.0859375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="112.0859375" x1="-112.0859375" class="divider"/>
diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md
index e66b4280..19e501ab 100644
--- a/docs/test_cases/t00028.md
+++ b/docs/test_cases/t00028.md
@@ -416,6 +416,7 @@ class R {
       "methods": [
         {
           "access": "private",
+          "display_name": "R",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -443,6 +444,7 @@ class R {
             "line": 37,
             "translation_unit": "t00028.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index 3a8ba90b..e41043d4 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:1066px;height:410px;" version="1.1" viewBox="0 0 1066 410" width="1066px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1q7lvd85rvk03" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbv9l5jy8ga6n" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="63.5" y="226.5"/>
       <ellipse cx="78.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.4688,248.1406 Q80.8906,248.4375 80.25,248.5781 Q79.6094,248.7344 78.9063,248.7344 Q76.4063,248.7344 75.0781,247.0938 Q73.7656,245.4375 73.7656,242.3125 Q73.7656,239.1875 75.0781,237.5313 Q76.4063,235.875 78.9063,235.875 Q79.6094,235.875 80.25,236.0313 Q80.9063,236.1875 81.4688,236.4844 L81.4688,239.2031 Q80.8438,238.625 80.25,238.3594 Q79.6563,238.0781 79.0313,238.0781 Q77.6875,238.0781 77,239.1563 Q76.3125,240.2188 76.3125,242.3125 Q76.3125,244.4063 77,245.4844 Q77.6875,246.5469 79.0313,246.5469 Q79.6563,246.5469 80.25,246.2813 Q80.8438,246 81.4688,245.4219 L81.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="92.5" y="246.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64.5" x2="102.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,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(#f1q7lvd85rvk03)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L55.25,89.6328 L80,226.42 L63.25,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(#fbv9l5jy8ga6n)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="707.5" y="226.5"/>
       <ellipse cx="722.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M725.4688,248.1406 Q724.8906,248.4375 724.25,248.5781 Q723.6094,248.7344 722.9063,248.7344 Q720.4063,248.7344 719.0781,247.0938 Q717.7656,245.4375 717.7656,242.3125 Q717.7656,239.1875 719.0781,237.5313 Q720.4063,235.875 722.9063,235.875 Q723.6094,235.875 724.25,236.0313 Q724.9063,236.1875 725.4688,236.4844 L725.4688,239.2031 Q724.8438,238.625 724.25,238.3594 Q723.6563,238.0781 723.0313,238.0781 Q721.6875,238.0781 721,239.1563 Q720.3125,240.2188 720.3125,242.3125 Q720.3125,244.4063 721,245.4844 Q721.6875,246.5469 723.0313,246.5469 Q723.6563,246.5469 724.25,246.2813 Q724.8438,246 725.4688,245.4219 L725.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="736.5" y="246.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="708.5" x2="746.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#f1q7lvd85rvk03)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M569,238 L569,263.1328 A0,0 0 0 0 569,263.1328 L672,263.1328 A0,0 0 0 0 672,263.1328 L672,256 L707.24,250.5 L672,248 L672,248 L662,238 L569,238 A0,0 0 0 0 569,238 " fill="#FBFB77" filter="url(#fbv9l5jy8ga6n)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M662,238 L662,248 L672,248 L662,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="575" y="255.0669">B class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="269.5" y="226.5"/>
       <ellipse cx="284.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M287.4688,248.1406 Q286.8906,248.4375 286.25,248.5781 Q285.6094,248.7344 284.9063,248.7344 Q282.4063,248.7344 281.0781,247.0938 Q279.7656,245.4375 279.7656,242.3125 Q279.7656,239.1875 281.0781,237.5313 Q282.4063,235.875 284.9063,235.875 Q285.6094,235.875 286.25,236.0313 Q286.9063,236.1875 287.4688,236.4844 L287.4688,239.2031 Q286.8438,238.625 286.25,238.3594 Q285.6563,238.0781 285.0313,238.0781 Q283.6875,238.0781 283,239.1563 Q282.3125,240.2188 282.3125,242.3125 Q282.3125,244.4063 283,245.4844 Q283.6875,246.5469 285.0313,246.5469 Q285.6563,246.5469 286.25,246.2813 Q286.8438,246 287.4688,245.4219 L287.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="298.5" y="246.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="308.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#f1q7lvd85rvk03)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M182,357 L182,382.1328 A0,0 0 0 0 182,382.1328 L285,382.1328 A0,0 0 0 0 285,382.1328 L285,367 L275,357 L243.08,357 L278.44,274.62 L235.08,357 L182,357 A0,0 0 0 0 182,357 " fill="#FBFB77" filter="url(#fbv9l5jy8ga6n)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M275,357 L275,367 L285,367 L275,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="188" y="374.0669">C class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="872" y="226.5"/>
       <ellipse cx="887" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M889.9688,248.1406 Q889.3906,248.4375 888.75,248.5781 Q888.1094,248.7344 887.4063,248.7344 Q884.9063,248.7344 883.5781,247.0938 Q882.2656,245.4375 882.2656,242.3125 Q882.2656,239.1875 883.5781,237.5313 Q884.9063,235.875 887.4063,235.875 Q888.1094,235.875 888.75,236.0313 Q889.4063,236.1875 889.9688,236.4844 L889.9688,239.2031 Q889.3438,238.625 888.75,238.3594 Q888.1563,238.0781 887.5313,238.0781 Q886.1875,238.0781 885.5,239.1563 Q884.8125,240.2188 884.8125,242.3125 Q884.8125,244.4063 885.5,245.4844 Q886.1875,246.5469 887.5313,246.5469 Q888.1563,246.5469 888.75,246.2813 Q889.3438,246 889.9688,245.4219 L889.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="901" y="246.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="873" x2="912" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#f1q7lvd85rvk03)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M782.5,223 L782.5,278.3984 A0,0 0 0 0 782.5,278.3984 L836.5,278.3984 A0,0 0 0 0 836.5,278.3984 L836.5,254.5 L871.59,250.5 L836.5,246.5 L836.5,233 L826.5,223 L782.5,223 A0,0 0 0 0 782.5,223 " fill="#FBFB77" filter="url(#fbv9l5jy8ga6n)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M826.5,223 L826.5,233 L836.5,233 L826.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="788.5" y="240.0669">D</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="788.5" y="255.1997">class</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="788.5" y="270.3325">note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="519.5" y="339"/>
       <ellipse cx="548.45" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4188,360.6406 Q550.8406,360.9375 550.2,361.0781 Q549.5594,361.2344 548.8563,361.2344 Q546.3563,361.2344 545.0281,359.5938 Q543.7156,357.9375 543.7156,354.8125 Q543.7156,351.6875 545.0281,350.0313 Q546.3563,348.375 548.8563,348.375 Q549.5594,348.375 550.2,348.5313 Q550.8563,348.6875 551.4188,348.9844 L551.4188,351.7031 Q550.7938,351.125 550.2,350.8594 Q549.6063,350.5781 548.9813,350.5781 Q547.6375,350.5781 546.95,351.6563 Q546.2625,352.7188 546.2625,354.8125 Q546.2625,356.9063 546.95,357.9844 Q547.6375,359.0469 548.9813,359.0469 Q549.6063,359.0469 550.2,358.7813 Q550.7938,358.5 551.4188,357.9219 L551.4188,360.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="565.55" y="359.1543">E</text>
@@ -65,26 +65,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="371" y2="371"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="520.5" x2="600.5" y1="379" y2="379"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="525.5" y="385"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="527.5" y="387"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="539.5" y="393.2104">param : T</text>
     </a>
-    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#f1q7lvd85rvk03)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M320.5,357 L320.5,382.1328 A0,0 0 0 0 320.5,382.1328 L484.5,382.1328 A0,0 0 0 0 484.5,382.1328 L484.5,375 L519.28,369.5 L484.5,367 L484.5,367 L474.5,357 L320.5,357 A0,0 0 0 0 320.5,357 " fill="#FBFB77" filter="url(#fbv9l5jy8ga6n)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M474.5,357 L474.5,367 L484.5,367 L474.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="326.5" y="374.0669">E template class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="397" y="226.5"/>
       <ellipse cx="412" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M414.9688,248.1406 Q414.3906,248.4375 413.75,248.5781 Q413.1094,248.7344 412.4063,248.7344 Q409.9063,248.7344 408.5781,247.0938 Q407.2656,245.4375 407.2656,242.3125 Q407.2656,239.1875 408.5781,237.5313 Q409.9063,235.875 412.4063,235.875 Q413.1094,235.875 413.75,236.0313 Q414.4063,236.1875 414.9688,236.4844 L414.9688,239.2031 Q414.3438,238.625 413.75,238.3594 Q413.1563,238.0781 412.5313,238.0781 Q411.1875,238.0781 410.5,239.1563 Q409.8125,240.2188 409.8125,242.3125 Q409.8125,244.4063 410.5,245.4844 Q411.1875,246.5469 412.5313,246.5469 Q413.1563,246.5469 413.75,246.2813 Q414.3438,246 414.9688,245.4219 L414.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="426" y="246.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398" x2="437" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="980.5" y="34"/>
       <ellipse cx="996.85" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1000.9594,56 L993.2406,56 L993.2406,43.6094 L1000.9594,43.6094 L1000.9594,45.7656 L995.6938,45.7656 L995.6938,48.4375 L1000.4594,48.4375 L1000.4594,50.5938 L995.6938,50.5938 L995.6938,53.8438 L1000.9594,53.8438 L1000.9594,56 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1011.15" y="54.1543">F</text>
@@ -94,11 +94,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="986.5" y="105.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="981.5" x2="1021.5" y1="112.4141" y2="112.4141"/>
     </a>
-    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#f1q7lvd85rvk03)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M948.5,238 L948.5,263.1328 A0,0 0 0 0 948.5,263.1328 L1054.5,263.1328 A0,0 0 0 0 1054.5,263.1328 L1054.5,248 L1044.5,238 L1005.5,238 L1001.5,120.39 L997.5,238 L948.5,238 A0,0 0 0 0 948.5,238 " fill="#FBFB77" filter="url(#fbv9l5jy8ga6n)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1044.5,238 L1044.5,248 L1054.5,248 L1044.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="954.5" y="255.0669">F enum note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="473.5" y="226.5"/>
       <ellipse cx="488.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M491.4688,248.1406 Q490.8906,248.4375 490.25,248.5781 Q489.6094,248.7344 488.9063,248.7344 Q486.4063,248.7344 485.0781,247.0938 Q483.7656,245.4375 483.7656,242.3125 Q483.7656,239.1875 485.0781,237.5313 Q486.4063,235.875 488.9063,235.875 Q489.6094,235.875 490.25,236.0313 Q490.9063,236.1875 491.4688,236.4844 L491.4688,239.2031 Q490.8438,238.625 490.25,238.3594 Q489.6563,238.0781 489.0313,238.0781 Q487.6875,238.0781 487,239.1563 Q486.3125,240.2188 486.3125,242.3125 Q486.3125,244.4063 487,245.4844 Q487.6875,246.5469 489.0313,246.5469 Q489.6563,246.5469 490.25,246.2813 Q490.8438,246 491.4688,245.4219 L491.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.5" y="246.6543">E</text>
@@ -107,70 +107,70 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="474.5" x2="532.5" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1q7lvd85rvk03)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbv9l5jy8ga6n)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="46"/>
       <rect fill="#F24D5C" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="397.5" y="54.2104">R(C &amp; c) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">bbb : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="94.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="100.6245">ccc : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="105.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="107.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.4292">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="118.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="120.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="126.2339">eee : E&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="130.8281"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="132.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="139.0386">ggg : G **</text>
     </a>
-    <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(#f1q7lvd85rvk03)" 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(#fbv9l5jy8ga6n)" 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,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#f1q7lvd85rvk03)" 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,71.207 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#fbv9l5jy8ga6n)" 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,96.8164 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(#f1q7lvd85rvk03)" 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,96.8164 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(#fbv9l5jy8ga6n)" 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="M514.76,274.62 C521.16,287.75 529.42,304.71 537.16,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/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg
index 10000cd0..15507814 100644
--- a/docs/test_cases/t00028_class_mermaid.svg
+++ b/docs/test_cases/t00028_class_mermaid.svg
@@ -218,7 +218,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L8">
+        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L8">
           <g title="A" id="classId-C_0001519850480962783588-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -237,7 +237,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L11">
+        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L11">
           <g title="B" id="classId-C_0001980597091567213070-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -256,7 +256,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L16">
+        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L16">
           <g title="C" id="classId-C_0000984577258575112753-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -275,7 +275,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L22">
+        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L22">
           <g title="D" id="classId-C_0001263778658518784070-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -294,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001014136565447389473-4" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -318,7 +318,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L30">
+        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L30">
           <g title="G" id="classId-C_0000764713728396057122-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -337,7 +337,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L33">
+        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L33">
           <g title="F" id="classId-C_0000589227897266388677-6" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -371,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L25">
+        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L25">
           <g title="E" id="classId-C_0001949673179441298667-7" class="node default clickable">
             <rect height="57" width="63.90625" y="-28.5" x="-31.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -390,7 +390,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00028/t00028.cc#L36">
+        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00028/t00028.cc#L36">
           <g title="R" id="classId-C_0001189142882239313116-8" class="node default clickable">
             <rect height="211" width="289.828125" y="-105.5" x="-144.9140625" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="144.9140625" x1="-144.9140625" class="divider"/>
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index e980b379..d7bd07a8 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="268px" preserveAspectRatio="none" style="width:501px;height:268px;" version="1.1" viewBox="0 0 501 268" width="501px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="feytz2fu5p824" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1tfklz2p6yaxg" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="27"/>
       <ellipse cx="22" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,48.6406 Q24.3906,48.9375 23.75,49.0781 Q23.1094,49.2344 22.4063,49.2344 Q19.9063,49.2344 18.5781,47.5938 Q17.2656,45.9375 17.2656,42.8125 Q17.2656,39.6875 18.5781,38.0313 Q19.9063,36.375 22.4063,36.375 Q23.1094,36.375 23.75,36.5313 Q24.4063,36.6875 24.9688,36.9844 L24.9688,39.7031 Q24.3438,39.125 23.75,38.8594 Q23.1563,38.5781 22.5313,38.5781 Q21.1875,38.5781 20.5,39.6563 Q19.8125,40.7188 19.8125,42.8125 Q19.8125,44.9063 20.5,45.9844 Q21.1875,47.0469 22.5313,47.0469 Q23.1563,47.0469 23.75,46.7813 Q24.3438,46.5 24.9688,45.9219 L24.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="47.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="46" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="82" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="82" y="20.5"/>
       <ellipse cx="110.95" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M113.9188,42.1406 Q113.3406,42.4375 112.7,42.5781 Q112.0594,42.7344 111.3563,42.7344 Q108.8563,42.7344 107.5281,41.0938 Q106.2156,39.4375 106.2156,36.3125 Q106.2156,33.1875 107.5281,31.5313 Q108.8563,29.875 111.3563,29.875 Q112.0594,29.875 112.7,30.0313 Q113.3563,30.1875 113.9188,30.4844 L113.9188,33.2031 Q113.2938,32.625 112.7,32.3594 Q112.1063,32.0781 111.4813,32.0781 Q110.1375,32.0781 109.45,33.1563 Q108.7625,34.2188 108.7625,36.3125 Q108.7625,38.4063 109.45,39.4844 Q110.1375,40.5469 111.4813,40.5469 Q112.1063,40.5469 112.7,40.2813 Q113.2938,40 113.9188,39.4219 L113.9188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="128.05" y="40.6543">C</text>
@@ -27,30 +27,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="83" x2="163" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="88" y="66.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="90" y="68.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="102" y="74.7104">param : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="60.8047" id="C_0001496914969429483234" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="199" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="60.8047" id="C_0001496914969429483234" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="199" y="20.5"/>
       <ellipse cx="232.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.4188,42.1406 Q234.8406,42.4375 234.2,42.5781 Q233.5594,42.7344 232.8563,42.7344 Q230.3563,42.7344 229.0281,41.0938 Q227.7156,39.4375 227.7156,36.3125 Q227.7156,33.1875 229.0281,31.5313 Q230.3563,29.875 232.8563,29.875 Q233.5594,29.875 234.2,30.0313 Q234.8563,30.1875 235.4188,30.4844 L235.4188,33.2031 Q234.7938,32.625 234.2,32.3594 Q233.6063,32.0781 232.9813,32.0781 Q231.6375,32.0781 230.95,33.1563 Q230.2625,34.2188 230.2625,36.3125 Q230.2625,38.4063 230.95,39.4844 Q231.6375,40.5469 232.9813,40.5469 Q233.6063,40.5469 234.2,40.2813 Q234.7938,40 235.4188,39.4219 L235.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="250.55" y="40.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="200" x2="280" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="205" y="66.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="207" y="68.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="219" y="74.7104">param : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="6" y="171"/>
       <ellipse cx="21.9" cy="187" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.0094,193 L18.2906,193 L18.2906,180.6094 L26.0094,180.6094 L26.0094,182.7656 L20.7438,182.7656 L20.7438,185.4375 L25.5094,185.4375 L25.5094,187.5938 L20.7438,187.5938 L20.7438,190.8438 L26.0094,190.8438 L26.0094,193 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36.1" y="191.1543">E</text>
@@ -60,65 +60,65 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="12" y="242.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="47" y1="249.4141" y2="249.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="336.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="336.5" y="190"/>
       <ellipse cx="351.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,211.6406 Q353.8906,211.9375 353.25,212.0781 Q352.6094,212.2344 351.9063,212.2344 Q349.4063,212.2344 348.0781,210.5938 Q346.7656,208.9375 346.7656,205.8125 Q346.7656,202.6875 348.0781,201.0313 Q349.4063,199.375 351.9063,199.375 Q352.6094,199.375 353.25,199.5313 Q353.9063,199.6875 354.4688,199.9844 L354.4688,202.7031 Q353.8438,202.125 353.25,201.8594 Q352.6563,201.5781 352.0313,201.5781 Q350.6875,201.5781 350,202.6563 Q349.3125,203.7188 349.3125,205.8125 Q349.3125,207.9063 350,208.9844 Q350.6875,210.0469 352.0313,210.0469 Q352.6563,210.0469 353.25,209.7813 Q353.8438,209.5 354.4688,208.9219 L354.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="365.5" y="210.1543">G1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="384.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="83.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="83.5" y="190"/>
       <ellipse cx="98.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.4688,211.6406 Q100.8906,211.9375 100.25,212.0781 Q99.6094,212.2344 98.9063,212.2344 Q96.4063,212.2344 95.0781,210.5938 Q93.7656,208.9375 93.7656,205.8125 Q93.7656,202.6875 95.0781,201.0313 Q96.4063,199.375 98.9063,199.375 Q99.6094,199.375 100.25,199.5313 Q100.9063,199.6875 101.4688,199.9844 L101.4688,202.7031 Q100.8438,202.125 100.25,201.8594 Q99.6563,201.5781 99.0313,201.5781 Q97.6875,201.5781 97,202.6563 Q96.3125,203.7188 96.3125,205.8125 Q96.3125,207.9063 97,208.9844 Q97.6875,210.0469 99.0313,210.0469 Q99.6563,210.0469 100.25,209.7813 Q100.8438,209.5 101.4688,208.9219 L101.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="112.5" y="210.1543">G2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="84.5" x2="131.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="167.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="167.5" y="190"/>
       <ellipse cx="182.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M185.4688,211.6406 Q184.8906,211.9375 184.25,212.0781 Q183.6094,212.2344 182.9063,212.2344 Q180.4063,212.2344 179.0781,210.5938 Q177.7656,208.9375 177.7656,205.8125 Q177.7656,202.6875 179.0781,201.0313 Q180.4063,199.375 182.9063,199.375 Q183.6094,199.375 184.25,199.5313 Q184.9063,199.6875 185.4688,199.9844 L185.4688,202.7031 Q184.8438,202.125 184.25,201.8594 Q183.6563,201.5781 183.0313,201.5781 Q181.6875,201.5781 181,202.6563 Q180.3125,203.7188 180.3125,205.8125 Q180.3125,207.9063 181,208.9844 Q181.6875,210.0469 183.0313,210.0469 Q183.6563,210.0469 184.25,209.7813 Q184.8438,209.5 185.4688,208.9219 L185.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="196.5" y="210.1543">G3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="168.5" x2="215.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="420.5" y="190"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="420.5" y="190"/>
       <ellipse cx="435.5" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M438.4688,211.6406 Q437.8906,211.9375 437.25,212.0781 Q436.6094,212.2344 435.9063,212.2344 Q433.4063,212.2344 432.0781,210.5938 Q430.7656,208.9375 430.7656,205.8125 Q430.7656,202.6875 432.0781,201.0313 Q433.4063,199.375 435.9063,199.375 Q436.6094,199.375 437.25,199.5313 Q437.9063,199.6875 438.4688,199.9844 L438.4688,202.7031 Q437.8438,202.125 437.25,201.8594 Q436.6563,201.5781 436.0313,201.5781 Q434.6875,201.5781 434,202.6563 Q433.3125,203.7188 433.3125,205.8125 Q433.3125,207.9063 434,208.9844 Q434.6875,210.0469 436.0313,210.0469 Q436.6563,210.0469 437.25,209.7813 Q437.8438,209.5 438.4688,208.9219 L438.4688,211.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="449.5" y="210.1543">G4</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="222" y2="222"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="421.5" x2="468.5" y1="230" y2="230"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#feytz2fu5p824)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="316" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tfklz2p6yaxg)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="316" 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="317" x2="489" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="317" x2="489" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="322" y="54"/>
       <ellipse cx="327" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="336" y="62.2104">g1 : G1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="322" y="66.8047"/>
       <ellipse cx="327" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="336" y="75.0151">g3 : G3 &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="322" y="79.6094"/>
       <ellipse cx="327" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="336" y="87.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
     </a>
     <path d="M377.56,106.71 C375.45,112.47 373.54,118.3 372,124 C366.05,145.94 363.31,171.8 362.05,189.98 " fill="none" id="C_0000348749731659902910&lt;-C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg
index e6d420bb..ebde1701 100644
--- a/docs/test_cases/t00029_class_mermaid.svg
+++ b/docs/test_cases/t00029_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L7">
+        <a transform="translate(21.28125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L7">
           <g title="A" id="classId-C_0001970994826766369014-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -97,7 +97,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L12">
+        <a transform="translate(128.8125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L12">
           <g title="C" id="classId-C_0000543766389270348470-1" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -121,7 +121,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L17">
+        <a transform="translate(267.3125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L17">
           <g title="D" id="classId-C_0001496914969429483234-2" class="node default clickable">
             <rect height="79" width="88.5" y="-39.5" x="-44.25" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -145,7 +145,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L21">
+        <a transform="translate(422.4375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L21">
           <g title="E" id="classId-C_0001936873082456592219-3" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -179,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L26">
+        <a transform="translate(763.9453125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L26">
           <g title="G1" id="classId-C_0001980718063838190763-4" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -198,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L28">
+        <a transform="translate(551.484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L28">
           <g title="G2" id="classId-C_0002204627213593766591-5" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -217,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L30">
+        <a transform="translate(637.828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L30">
           <g title="G3" id="classId-C_0000767180516665070631-6" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -236,7 +236,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L32">
+        <a transform="translate(850.2890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L32">
           <g title="G4" id="classId-C_0000715074622924270214-7" class="node default clickable">
             <rect height="57" width="36.34375" y="-28.5" x="-18.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.171875" x1="-18.171875" class="divider"/>
@@ -255,7 +255,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00029/t00029.cc#L34">
+        <a transform="translate(807.1171875, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00029/t00029.cc#L34">
           <g title="R" id="classId-C_0000348749731659902910-8" class="node default clickable">
             <rect height="123" width="202.234375" y="-61.5" x="-101.1171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="101.1171875" x1="-101.1171875" class="divider"/>
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index d5591b55..2efaca3c 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="f16kl44d2tgsat" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1hcqyqs81hnwd" 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,87 +9,87 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kl44d2tgsat)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hcqyqs81hnwd)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kl44d2tgsat)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hcqyqs81hnwd)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kl44d2tgsat)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hcqyqs81hnwd)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kl44d2tgsat)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hcqyqs81hnwd)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kl44d2tgsat)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hcqyqs81hnwd)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kl44d2tgsat)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hcqyqs81hnwd)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="120" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="120" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <ellipse cx="120" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">ccc : std::vector&lt;C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92.4141"/>
       <ellipse cx="120" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="100.6245">ddd : D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="105.2188"/>
       <ellipse cx="120" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.4292">eee : E *</text>
     </a>
     <path d="M111.59,120.19 C100.65,129.74 89.75,139.87 80,150 C67.26,163.23 54.64,179.38 44.8,192.83 " fill="none" id="C_0000263468735940481091-&gt;C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg
index 8709e26f..a714fd2f 100644
--- a/docs/test_cases/t00030_class_mermaid.svg
+++ b/docs/test_cases/t00030_class_mermaid.svg
@@ -164,7 +164,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L7">
+        <a transform="translate(26.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L7">
           <g title="A" id="classId-C_0000064769484767514424-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -183,7 +183,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L9">
+        <a transform="translate(102.5859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L9">
           <g title="B" id="classId-C_0000156923198106222307-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -202,7 +202,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L11">
+        <a transform="translate(179.1484375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L11">
           <g title="C" id="classId-C_0001651557398557662399-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -221,7 +221,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L13">
+        <a transform="translate(255.7109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L13">
           <g title="D" id="classId-C_0001089781072752262158-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -240,7 +240,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L15">
+        <a transform="translate(331.828125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L15">
           <g title="E" id="classId-C_0000425964641881054607-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -259,7 +259,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00030/t00030.cc#L17">
+        <a transform="translate(179.1484375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00030/t00030.cc#L17">
           <g title="R" id="classId-C_0000263468735940481091-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md
index ae7ed19d..2a2e3ea4 100644
--- a/docs/test_cases/t00031.md
+++ b/docs/test_cases/t00031.md
@@ -289,6 +289,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "add_b",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -316,6 +317,7 @@ struct R {
             "line": 28,
             "translation_unit": "t00031.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 40ccd9d8..85e23d88 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="415px" preserveAspectRatio="none" style="width:353px;height:415px;" version="1.1" viewBox="0 0 353 415" width="353px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="gxrbg5kd84phh0" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="gl955pnay8vk90" 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="fxrbg5kd84phh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fl955pnay8vk9" 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="gxrbg5kd84phh1" x1="0%" x2="100%" y1="0%" y2="100%">
+    <linearGradient id="gl955pnay8vk91" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="url(#gxrbg5kd84phh0)" filter="url(#fxrbg5kd84phh)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
-      <rect fill="url(#gxrbg5kd84phh1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="url(#gl955pnay8vk90)" filter="url(#fl955pnay8vk9)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
+      <rect fill="url(#gl955pnay8vk91)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="216"/>
       <ellipse cx="21" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,237.6406 Q23.3906,237.9375 22.75,238.0781 Q22.1094,238.2344 21.4063,238.2344 Q18.9063,238.2344 17.5781,236.5938 Q16.2656,234.9375 16.2656,231.8125 Q16.2656,228.6875 17.5781,227.0313 Q18.9063,225.375 21.4063,225.375 Q22.1094,225.375 22.75,225.5313 Q23.4063,225.6875 23.9688,225.9844 L23.9688,228.7031 Q23.3438,228.125 22.75,227.8594 Q22.1563,227.5781 21.5313,227.5781 Q20.1875,227.5781 19.5,228.6563 Q18.8125,229.7188 18.8125,231.8125 Q18.8125,233.9063 19.5,234.9844 Q20.1875,236.0469 21.5313,236.0469 Q22.1563,236.0469 22.75,235.7813 Q23.3438,235.5 23.9688,234.9219 L23.9688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="236.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxrbg5kd84phh)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl955pnay8vk9)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="103" y="197"/>
       <ellipse cx="118.9" cy="213" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M123.0094,219 L115.2906,219 L115.2906,206.6094 L123.0094,206.6094 L123.0094,208.7656 L117.7438,208.7656 L117.7438,211.4375 L122.5094,211.4375 L122.5094,213.5938 L117.7438,213.5938 L117.7438,216.8438 L123.0094,216.8438 L123.0094,219 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="133.1" y="217.1543">B</text>
@@ -37,8 +37,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="109" y="268.8198">three</text>
       <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="104" x2="144" y1="275.4141" y2="275.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FFC0CB" filter="url(#fxrbg5kd84phh)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FFC0CB" filter="url(#fl955pnay8vk9)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
       <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="280.5" y="344"/>
       <ellipse cx="298.2" cy="360" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
       <path d="M301.1688,365.6406 Q300.5906,365.9375 299.95,366.0781 Q299.3094,366.2344 298.6063,366.2344 Q296.1063,366.2344 294.7781,364.5938 Q293.4656,362.9375 293.4656,359.8125 Q293.4656,356.6875 294.7781,355.0313 Q296.1063,353.375 298.6063,353.375 Q299.3094,353.375 299.95,353.5313 Q300.6063,353.6875 301.1688,353.9844 L301.1688,356.7031 Q300.5438,356.125 299.95,355.8594 Q299.3563,355.5781 298.7313,355.5781 Q297.3875,355.5781 296.7,356.6563 Q296.0125,357.7188 296.0125,359.8125 Q296.0125,361.9063 296.7,362.9844 Q297.3875,364.0469 298.7313,364.0469 Q299.3563,364.0469 299.95,363.7813 Q300.5438,363.5 301.1688,362.9219 L301.1688,365.6406 Z "/>
@@ -48,23 +48,23 @@
       <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="376" y2="376"/>
       <line style="stroke: #FF0000; stroke-width: 1.5;" x1="281.5" x2="336.5" y1="384" y2="384"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="286.5" y="390"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="288.5" y="392"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="300.5" y="398.2104">ttt : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxrbg5kd84phh)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl955pnay8vk9)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="202.5" y="216"/>
       <ellipse cx="217.5" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M220.4688,237.6406 Q219.8906,237.9375 219.25,238.0781 Q218.6094,238.2344 217.9063,238.2344 Q215.4063,238.2344 214.0781,236.5938 Q212.7656,234.9375 212.7656,231.8125 Q212.7656,228.6875 214.0781,227.0313 Q215.4063,225.375 217.9063,225.375 Q218.6094,225.375 219.25,225.5313 Q219.9063,225.6875 220.4688,225.9844 L220.4688,228.7031 Q219.8438,228.125 219.25,227.8594 Q218.6563,227.5781 218.0313,227.5781 Q216.6875,227.5781 216,228.6563 Q215.3125,229.7188 215.3125,231.8125 Q215.3125,233.9063 216,234.9844 Q216.6875,236.0469 218.0313,236.0469 Q218.6563,236.0469 219.25,235.7813 Q219.8438,235.5 220.4688,234.9219 L220.4688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="231.5" y="236.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="242.5" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxrbg5kd84phh)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl955pnay8vk9)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="279" y="216"/>
       <ellipse cx="294" cy="232" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M296.9688,237.6406 Q296.3906,237.9375 295.75,238.0781 Q295.1094,238.2344 294.4063,238.2344 Q291.9063,238.2344 290.5781,236.5938 Q289.2656,234.9375 289.2656,231.8125 Q289.2656,228.6875 290.5781,227.0313 Q291.9063,225.375 294.4063,225.375 Q295.1094,225.375 295.75,225.5313 Q296.4063,225.6875 296.9688,225.9844 L296.9688,228.7031 Q296.3438,228.125 295.75,227.8594 Q295.1563,227.5781 294.5313,227.5781 Q293.1875,227.5781 292.5,228.6563 Q291.8125,229.7188 291.8125,231.8125 Q291.8125,233.9063 292.5,234.9844 Q293.1875,236.0469 294.5313,236.0469 Q295.1563,236.0469 295.75,235.7813 Q296.3438,235.5 296.9688,234.9219 L296.9688,237.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="308" y="236.1543">C</text>
@@ -73,47 +73,47 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="248" y2="248"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280" x2="338" y1="256" y2="256"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxrbg5kd84phh)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl955pnay8vk9)" height="112.0234" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="72" y="8"/>
       <ellipse cx="136.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M139.7188,29.6406 Q139.1406,29.9375 138.5,30.0781 Q137.8594,30.2344 137.1563,30.2344 Q134.6563,30.2344 133.3281,28.5938 Q132.0156,26.9375 132.0156,23.8125 Q132.0156,20.6875 133.3281,19.0313 Q134.6563,17.375 137.1563,17.375 Q137.8594,17.375 138.5,17.5313 Q139.1563,17.6875 139.7188,17.9844 L139.7188,20.7031 Q139.0938,20.125 138.5,19.8594 Q137.9063,19.5781 137.2813,19.5781 Q135.9375,19.5781 135.25,20.6563 Q134.5625,21.7188 134.5625,23.8125 Q134.5625,25.9063 135.25,26.9844 Q135.9375,28.0469 137.2813,28.0469 Q137.9063,28.0469 138.5,27.7813 Q139.0938,27.5 139.7188,26.9219 L139.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="46"/>
       <ellipse cx="83" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L28" target="_top" title="add_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="add_b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="92" y="54.2104">add_b(B b) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="73" x2="217" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="78" y="66.8047"/>
       <ellipse cx="83" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92" y="75.0151">aaa : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="78" y="79.6094"/>
       <ellipse cx="83" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92" y="87.8198">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="92.4141"/>
       <ellipse cx="83" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="92" y="100.6245">ccc : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="78" y="105.2188"/>
       <ellipse cx="83" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="92" y="113.4292">ddd : D *</text>
     </a>
     <path d="M309,264.08 C309,280.48 309,303.13 309,323.57 " fill="none" id="C_0000208700529175860645-&gt;C_0000116209144733282955" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg
index 047d346a..12aada0c 100644
--- a/docs/test_cases/t00031_class_mermaid.svg
+++ b/docs/test_cases/t00031_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L8">
+        <a transform="translate(26.0234375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L8">
           <g title="A" id="classId-C_0000847775539502907247-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -145,7 +145,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L11">
+        <a transform="translate(150.1796875, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L11">
           <g title="B" id="classId-C_0001441796358326382179-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -179,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 477.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000116209144733282955-2" class="node default clickable">
             <rect height="79" width="56.484375" y="-39.5" x="-28.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.2421875" x1="-28.2421875" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L18">
+        <a transform="translate(274.3359375, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L18">
           <g title="D" id="classId-C_0002266534344475505157-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L14">
+        <a transform="translate(370.015625, 315.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L14">
           <g title="C" id="classId-C_0000208700529175860645-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00031/t00031.cc#L20">
+        <a transform="translate(184.234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00031/t00031.cc#L20">
           <g title="R" id="classId-C_0000484712092364868032-5" class="node default clickable">
             <rect height="167" width="167.546875" y="-83.5" x="-83.7734375" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="83.7734375" x1="-83.7734375" class="divider"/>
diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md
index e4d15f16..18d5f5e7 100644
--- a/docs/test_cases/t00032.md
+++ b/docs/test_cases/t00032.md
@@ -119,6 +119,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "operator()",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -141,6 +142,7 @@ struct R {
             "line": 12,
             "translation_unit": "t00032.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -168,6 +170,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "operator()",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -190,6 +193,7 @@ struct R {
             "line": 16,
             "translation_unit": "t00032.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -217,6 +221,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "operator()",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -239,6 +244,7 @@ struct R {
             "line": 20,
             "translation_unit": "t00032.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -363,7 +369,7 @@ struct R {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00032::TBase"
+          "type": "TBase"
         },
         {
           "is_variadic": false,
@@ -375,19 +381,19 @@ struct R {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00032::A"
+          "type": "A"
         },
         {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00032::B"
+          "type": "B"
         },
         {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00032::C"
+          "type": "C"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index 4582c9cb..47dcaef9 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:850px;height:326px;" version="1.1" viewBox="0 0 850 326" width="850px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1h85zyoxjfhp6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1m92274hz5670" 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,69 +9,69 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="144.5" y="146"/>
       <ellipse cx="159.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M162.4688,167.6406 Q161.8906,167.9375 161.25,168.0781 Q160.6094,168.2344 159.9063,168.2344 Q157.4063,168.2344 156.0781,166.5938 Q154.7656,164.9375 154.7656,161.8125 Q154.7656,158.6875 156.0781,157.0313 Q157.4063,155.375 159.9063,155.375 Q160.6094,155.375 161.25,155.5313 Q161.9063,155.6875 162.4688,155.9844 L162.4688,158.7031 Q161.8438,158.125 161.25,157.8594 Q160.6563,157.5781 160.0313,157.5781 Q158.6875,157.5781 158,158.6563 Q157.3125,159.7188 157.3125,161.8125 Q157.3125,163.9063 158,164.9844 Q158.6875,166.0469 160.0313,166.0469 Q160.6563,166.0469 161.25,165.7813 Q161.8438,165.5 162.4688,164.9219 L162.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="173.5" y="166.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="206.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="6" y="14.5"/>
       <ellipse cx="21" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,36.1406 Q23.3906,36.4375 22.75,36.5781 Q22.1094,36.7344 21.4063,36.7344 Q18.9063,36.7344 17.5781,35.0938 Q16.2656,33.4375 16.2656,30.3125 Q16.2656,27.1875 17.5781,25.5313 Q18.9063,23.875 21.4063,23.875 Q22.1094,23.875 22.75,24.0313 Q23.4063,24.1875 23.9688,24.4844 L23.9688,27.2031 Q23.3438,26.625 22.75,26.3594 Q22.1563,26.0781 21.5313,26.0781 Q20.1875,26.0781 19.5,27.1563 Q18.8125,28.2188 18.8125,30.3125 Q18.8125,32.4063 19.5,33.4844 Q20.1875,34.5469 21.5313,34.5469 Q22.1563,34.5469 22.75,34.2813 Q23.3438,34 23.9688,33.4219 L23.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="35" y="34.6543">TBase</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="75" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="111" y="8"/>
       <ellipse cx="165.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.7188,29.6406 Q168.1406,29.9375 167.5,30.0781 Q166.8594,30.2344 166.1563,30.2344 Q163.6563,30.2344 162.3281,28.5938 Q161.0156,26.9375 161.0156,23.8125 Q161.0156,20.6875 162.3281,19.0313 Q163.6563,17.375 166.1563,17.375 Q166.8594,17.375 167.5,17.5313 Q168.1563,17.6875 168.7188,17.9844 L168.7188,20.7031 Q168.0938,20.125 167.5,19.8594 Q166.9063,19.5781 166.2813,19.5781 Q164.9375,19.5781 164.25,20.6563 Q163.5625,21.7188 163.5625,23.8125 Q163.5625,25.9063 164.25,26.9844 Q164.9375,28.0469 166.2813,28.0469 Q166.9063,28.0469 167.5,27.7813 Q168.0938,27.5 168.7188,26.9219 L168.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="186.25" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="131" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="236" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="272" y="8"/>
       <ellipse cx="326.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M329.7188,29.6406 Q329.1406,29.9375 328.5,30.0781 Q327.8594,30.2344 327.1563,30.2344 Q324.6563,30.2344 323.3281,28.5938 Q322.0156,26.9375 322.0156,23.8125 Q322.0156,20.6875 323.3281,19.0313 Q324.6563,17.375 327.1563,17.375 Q327.8594,17.375 328.5,17.5313 Q329.1563,17.6875 329.7188,17.9844 L329.7188,20.7031 Q329.0938,20.125 328.5,19.8594 Q327.9063,19.5781 327.2813,19.5781 Q325.9375,19.5781 325.25,20.6563 Q324.5625,21.7188 324.5625,23.8125 Q324.5625,25.9063 325.25,26.9844 Q325.9375,28.0469 327.2813,28.0469 Q327.9063,28.0469 328.5,27.7813 Q329.0938,27.5 329.7188,26.9219 L329.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="347.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="278" y="46"/>
       <ellipse cx="283" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L16" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L16" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="292" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="273" x2="397" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="433" y="8"/>
       <ellipse cx="487.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M490.7188,29.6406 Q490.1406,29.9375 489.5,30.0781 Q488.8594,30.2344 488.1563,30.2344 Q485.6563,30.2344 484.3281,28.5938 Q483.0156,26.9375 483.0156,23.8125 Q483.0156,20.6875 484.3281,19.0313 Q485.6563,17.375 488.1563,17.375 Q488.8594,17.375 489.5,17.5313 Q490.1563,17.6875 490.7188,17.9844 L490.7188,20.7031 Q490.0938,20.125 489.5,19.8594 Q488.9063,19.5781 488.2813,19.5781 Q486.9375,19.5781 486.25,20.6563 Q485.5625,21.7188 485.5625,23.8125 Q485.5625,25.9063 486.25,26.9844 Q486.9375,28.0469 488.2813,28.0469 Q488.9063,28.0469 489.5,27.7813 Q490.0938,27.5 490.7188,26.9219 L490.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="508.25" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="439" y="46"/>
       <ellipse cx="444" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L20" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L20" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="453" y="54.2104">operator()() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="434" x2="558" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="127" y="255"/>
       <ellipse cx="142" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M144.9688,276.6406 Q144.3906,276.9375 143.75,277.0781 Q143.1094,277.2344 142.4063,277.2344 Q139.9063,277.2344 138.5781,275.5938 Q137.2656,273.9375 137.2656,270.8125 Q137.2656,267.6875 138.5781,266.0313 Q139.9063,264.375 142.4063,264.375 Q143.1094,264.375 143.75,264.5313 Q144.4063,264.6875 144.9688,264.9844 L144.9688,267.7031 Q144.3438,267.125 143.75,266.8594 Q143.1563,266.5781 142.5313,266.5781 Q141.1875,266.5781 140.5,267.6563 Q139.8125,268.7188 139.8125,270.8125 Q139.8125,272.9063 140.5,273.9844 Q141.1875,275.0469 142.5313,275.0469 Q143.1563,275.0469 143.75,274.7813 Q144.3438,274.5 144.9688,273.9219 L144.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="156" y="275.1543">Overload</text>
@@ -80,15 +80,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="287" y2="287"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128" x2="264" y1="295" y2="295"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="133" y="301"/>
       <ellipse cx="138" cy="306" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="147" y="309.2104">counter : L</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="243" y="146"/>
       <ellipse cx="258" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,167.6406 Q260.3906,167.9375 259.75,168.0781 Q259.1094,168.2344 258.4063,168.2344 Q255.9063,168.2344 254.5781,166.5938 Q253.2656,164.9375 253.2656,161.8125 Q253.2656,158.6875 254.5781,157.0313 Q255.9063,155.375 258.4063,155.375 Q259.1094,155.375 259.75,155.5313 Q260.4063,155.6875 260.9688,155.9844 L260.9688,158.7031 Q260.3438,158.125 259.75,157.8594 Q259.1563,157.5781 258.5313,157.5781 Q257.1875,157.5781 256.5,158.6563 Q255.8125,159.7188 255.8125,161.8125 Q255.8125,163.9063 256.5,164.9844 Q257.1875,166.0469 258.5313,166.0469 Q259.1563,166.0469 259.75,165.7813 Q260.3438,165.5 260.9688,164.9219 L260.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="272" y="166.1543">Overload</text>
@@ -97,19 +97,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="426" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h85zyoxjfhp6)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1m92274hz5670)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="594.5" y="8"/>
       <ellipse cx="708.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M711.7188,29.6406 Q711.1406,29.9375 710.5,30.0781 Q709.8594,30.2344 709.1563,30.2344 Q706.6563,30.2344 705.3281,28.5938 Q704.0156,26.9375 704.0156,23.8125 Q704.0156,20.6875 705.3281,19.0313 Q706.6563,17.375 709.1563,17.375 Q709.8594,17.375 710.5,17.5313 Q711.1563,17.6875 711.7188,17.9844 L711.7188,20.7031 Q711.0938,20.125 710.5,19.8594 Q709.9063,19.5781 709.2813,19.5781 Q707.9375,19.5781 707.25,20.6563 Q706.5625,21.7188 706.5625,23.8125 Q706.5625,25.9063 707.25,26.9844 Q707.9375,28.0469 709.2813,28.0469 Q709.9063,28.0469 710.5,27.7813 Q711.0938,27.5 711.7188,26.9219 L711.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="729.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="595.5" x2="838.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="600.5" y="54"/>
       <ellipse cx="605.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="614.5" y="62.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
     </a>
     <path d="M183.61,214.17 C186,227.73 188.58,242.4 190.77,254.81 " fill="none" id="C_0001619396229227632210&lt;-C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg
index ed943916..a714dd42 100644
--- a/docs/test_cases/t00032_class_mermaid.svg
+++ b/docs/test_cases/t00032_class_mermaid.svg
@@ -128,7 +128,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L7">
+        <a transform="translate(216.8046875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L7">
           <g title="Base" id="classId-C_0001619396229227632210-0" class="node default clickable">
             <rect height="57" width="53.25" y="-28.5" x="-26.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="26.625" x1="-26.625" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L9">
+        <a transform="translate(39.515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L9">
           <g title="TBase" id="classId-C_0000543776954602127752-1" class="node default clickable">
             <rect height="57" width="63.03125" y="-28.5" x="-31.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="31.515625" x1="-31.515625" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L11">
+        <a transform="translate(199.0078125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L11">
           <g title="A" id="classId-C_0000687909853333071234-2" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -190,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L15">
+        <a transform="translate(404.9609375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L15">
           <g title="B" id="classId-C_0000737235057776029746-3" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -214,7 +214,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L19">
+        <a transform="translate(610.9140625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L19">
           <g title="C" id="classId-C_0001497964256865073382-4" class="node default clickable">
             <rect height="79" width="155.953125" y="-39.5" x="-77.9765625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="77.9765625" x1="-77.9765625" class="divider"/>
@@ -238,7 +238,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L24">
+        <a transform="translate(310.8828125, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001463422997970691679-5" class="node default clickable">
             <rect height="79" width="160.53125" y="-39.5" x="-80.265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="80.265625" x1="-80.265625" class="divider"/>
@@ -262,7 +262,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L24">
+        <a transform="translate(404.9609375, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L24">
           <g title="Overload" id="classId-C_0001706455047176879286-6" class="node default clickable">
             <rect height="57" width="223.0625" y="-28.5" x="-111.53125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.53125" x1="-111.53125" class="divider"/>
@@ -281,7 +281,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00032/t00032.cc#L31">
+        <a transform="translate(887.1328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00032/t00032.cc#L31">
           <g title="R" id="classId-C_0000085539867332573320-7" class="node default clickable">
             <rect height="79" width="296.484375" y="-39.5" x="-148.2421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="148.2421875" x1="-148.2421875" class="divider"/>
diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md
index 9f5a1a9d..979d39b3 100644
--- a/docs/test_cases/t00033.md
+++ b/docs/test_cases/t00033.md
@@ -242,7 +242,7 @@ struct R {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00033::D"
+          "type": "D"
         }
       ],
       "type": "class"
@@ -335,7 +335,7 @@ struct R {
               "type": "std::unique_ptr"
             }
           ],
-          "type": "clanguml::t00033::B"
+          "type": "B"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 72741b4a..9790ab60 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:434px;height:570px;" version="1.1" viewBox="0 0 434 570" width="434px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f16yv28kujjkko" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fj6ufx2neb6wa" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="6" y="8"/>
       <ellipse cx="27.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M30.7188,29.6406 Q30.1406,29.9375 29.5,30.0781 Q28.8594,30.2344 28.1563,30.2344 Q25.6563,30.2344 24.3281,28.5938 Q23.0156,26.9375 23.0156,23.8125 Q23.0156,20.6875 24.3281,19.0313 Q25.6563,17.375 28.1563,17.375 Q28.8594,17.375 29.5,17.5313 Q30.1563,17.6875 30.7188,17.9844 L30.7188,20.7031 Q30.0938,20.125 29.5,19.8594 Q28.9063,19.5781 28.2813,19.5781 Q26.9375,19.5781 26.25,20.6563 Q25.5625,21.7188 25.5625,23.8125 Q25.5625,25.9063 26.25,26.9844 Q26.9375,28.0469 28.2813,28.0469 Q28.9063,28.0469 29.5,27.7813 Q30.0938,27.5 30.7188,26.9219 L30.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="43.25" y="28.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="71" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="71" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="12" y="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="26" y="62.2104">aaa : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="282" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="282" y="146"/>
       <ellipse cx="303.75" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M306.7188,167.6406 Q306.1406,167.9375 305.5,168.0781 Q304.8594,168.2344 304.1563,168.2344 Q301.6563,168.2344 300.3281,166.5938 Q299.0156,164.9375 299.0156,161.8125 Q299.0156,158.6875 300.3281,157.0313 Q301.6563,155.375 304.1563,155.375 Q304.8594,155.375 305.5,155.5313 Q306.1563,155.6875 306.7188,155.9844 L306.7188,158.7031 Q306.0938,158.125 305.5,157.8594 Q304.9063,157.5781 304.2813,157.5781 Q302.9375,157.5781 302.25,158.6563 Q301.5625,159.7188 301.5625,161.8125 Q301.5625,163.9063 302.25,164.9844 Q302.9375,166.0469 304.2813,166.0469 Q304.9063,166.0469 305.5,165.7813 Q306.0938,165.5 306.7188,164.9219 L306.7188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="319.25" y="166.1543">B</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="283" x2="347" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="283" x2="347" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="288" y="192"/>
       <ellipse cx="293" cy="197" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="302" y="200.2104">bbb : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="357.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="357.5" y="268"/>
       <ellipse cx="377.9" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M380.8688,289.6406 Q380.2906,289.9375 379.65,290.0781 Q379.0094,290.2344 378.3063,290.2344 Q375.8063,290.2344 374.4781,288.5938 Q373.1656,286.9375 373.1656,283.8125 Q373.1656,280.6875 374.4781,279.0313 Q375.8063,277.375 378.3063,277.375 Q379.0094,277.375 379.65,277.5313 Q380.3063,277.6875 380.8688,277.9844 L380.8688,280.7031 Q380.2438,280.125 379.65,279.8594 Q379.0563,279.5781 378.4313,279.5781 Q377.0875,279.5781 376.4,280.6563 Q375.7125,281.7188 375.7125,283.8125 Q375.7125,285.9063 376.4,286.9844 Q377.0875,288.0469 378.4313,288.0469 Q379.0563,288.0469 379.65,287.7813 Q380.2438,287.5 380.8688,286.9219 L380.8688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="393.1" y="288.1543">C</text>
@@ -53,30 +53,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="419.5" y1="300" y2="300"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="419.5" y1="308" y2="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="363.5" y="314"/>
       <ellipse cx="368.5" cy="319" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="377.5" y="322.2104">ccc : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="270.5" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="270.5" y="499"/>
       <ellipse cx="299.9" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M302.8688,520.6406 Q302.2906,520.9375 301.65,521.0781 Q301.0094,521.2344 300.3063,521.2344 Q297.8063,521.2344 296.4781,519.5938 Q295.1656,517.9375 295.1656,514.8125 Q295.1656,511.6875 296.4781,510.0313 Q297.8063,508.375 300.3063,508.375 Q301.0094,508.375 301.65,508.5313 Q302.3063,508.6875 302.8688,508.9844 L302.8688,511.7031 Q302.2438,511.125 301.65,510.8594 Q301.0563,510.5781 300.4313,510.5781 Q299.0875,510.5781 298.4,511.6563 Q297.7125,512.7188 297.7125,514.8125 Q297.7125,516.9063 298.4,517.9844 Q299.0875,519.0469 300.4313,519.0469 Q301.0563,519.0469 301.65,518.7813 Q302.2438,518.5 302.8688,517.9219 L302.8688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="317.1" y="519.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="342.5" y1="531" y2="531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="342.5" y1="539" y2="539"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="276.5" y="545"/>
       <ellipse cx="281.5" cy="550" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="290.5" y="553.2104">ddd : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="280.5" y="390"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="280.5" y="390"/>
       <ellipse cx="295.5" cy="406" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M298.4688,411.6406 Q297.8906,411.9375 297.25,412.0781 Q296.6094,412.2344 295.9063,412.2344 Q293.4063,412.2344 292.0781,410.5938 Q290.7656,408.9375 290.7656,405.8125 Q290.7656,402.6875 292.0781,401.0313 Q293.4063,399.375 295.9063,399.375 Q296.6094,399.375 297.25,399.5313 Q297.9063,399.6875 298.4688,399.9844 L298.4688,402.7031 Q297.8438,402.125 297.25,401.8594 Q296.6563,401.5781 296.0313,401.5781 Q294.6875,401.5781 294,402.6563 Q293.3125,403.7188 293.3125,405.8125 Q293.3125,407.9063 294,408.9844 Q294.6875,410.0469 296.0313,410.0469 Q296.6563,410.0469 297.25,409.7813 Q297.8438,409.5 298.4688,408.9219 L298.4688,411.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="309.5" y="410.1543">C</text>
@@ -85,8 +85,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="332.5" y1="422" y2="422"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="281.5" x2="332.5" y1="430" y2="430"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="127.5" y="274.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="127.5" y="274.5"/>
       <ellipse cx="142.5" cy="290.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.4688,296.1406 Q144.8906,296.4375 144.25,296.5781 Q143.6094,296.7344 142.9063,296.7344 Q140.4063,296.7344 139.0781,295.0938 Q137.7656,293.4375 137.7656,290.3125 Q137.7656,287.1875 139.0781,285.5313 Q140.4063,283.875 142.9063,283.875 Q143.6094,283.875 144.25,284.0313 Q144.9063,284.1875 145.4688,284.4844 L145.4688,287.2031 Q144.8438,286.625 144.25,286.3594 Q143.6563,286.0781 143.0313,286.0781 Q141.6875,286.0781 141,287.1563 Q140.3125,288.2188 140.3125,290.3125 Q140.3125,292.4063 141,293.4844 Q141.6875,294.5469 143.0313,294.5469 Q143.6563,294.5469 144.25,294.2813 Q144.8438,294 145.4688,293.4219 L145.4688,296.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.5" y="294.6543">B</text>
@@ -95,8 +95,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="321.5" y1="306.5" y2="306.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="321.5" y1="314.5" y2="314.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="23.5" y="152.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="23.5" y="152.5"/>
       <ellipse cx="38.5" cy="168.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M41.4688,174.1406 Q40.8906,174.4375 40.25,174.5781 Q39.6094,174.7344 38.9063,174.7344 Q36.4063,174.7344 35.0781,173.0938 Q33.7656,171.4375 33.7656,168.3125 Q33.7656,165.1875 35.0781,163.5313 Q36.4063,161.875 38.9063,161.875 Q39.6094,161.875 40.25,162.0313 Q40.9063,162.1875 41.4688,162.4844 L41.4688,165.2031 Q40.8438,164.625 40.25,164.3594 Q39.6563,164.0781 39.0313,164.0781 Q37.6875,164.0781 37,165.1563 Q36.3125,166.2188 36.3125,168.3125 Q36.3125,170.4063 37,171.4844 Q37.6875,172.5469 39.0313,172.5469 Q39.6563,172.5469 40.25,172.2813 Q40.8438,172 41.4688,171.4219 L41.4688,174.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="52.5" y="172.6543">A</text>
@@ -105,19 +105,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="24.5" x2="245.5" y1="184.5" y2="184.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="24.5" x2="245.5" y1="192.5" y2="192.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16yv28kujjkko)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="107.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fj6ufx2neb6wa)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="107.5" y="8"/>
       <ellipse cx="222.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M225.7188,29.6406 Q225.1406,29.9375 224.5,30.0781 Q223.8594,30.2344 223.1563,30.2344 Q220.6563,30.2344 219.3281,28.5938 Q218.0156,26.9375 218.0156,23.8125 Q218.0156,20.6875 219.3281,19.0313 Q220.6563,17.375 223.1563,17.375 Q223.8594,17.375 224.5,17.5313 Q225.1563,17.6875 225.7188,17.9844 L225.7188,20.7031 Q225.0938,20.125 224.5,19.8594 Q223.9063,19.5781 223.2813,19.5781 Q221.9375,19.5781 221.25,20.6563 Q220.5625,21.7188 220.5625,23.8125 Q220.5625,25.9063 221.25,26.9844 Q221.9375,28.0469 223.2813,28.0469 Q223.9063,28.0469 224.5,27.7813 Q225.0938,27.5 225.7188,26.9219 L225.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="243.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="108.5" x2="353.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="108.5" x2="353.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.5" y="54"/>
       <ellipse cx="118.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="127.5" y="62.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
     </a>
     <path d="M307,438.24 C307,454.11 307,475.43 307,493.36 " fill="none" id="C_0001609446044604054241-&gt;C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg
index 1bf9ddb6..c3b9c89e 100644
--- a/docs/test_cases/t00033_class_mermaid.svg
+++ b/docs/test_cases/t00033_class_mermaid.svg
@@ -138,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7">
+        <a transform="translate(52.6015625, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0002036031998980633871-0" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L11">
+        <a transform="translate(193.390625, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L11">
           <g title="B" id="classId-C_0000765515233845859023-1" class="node default clickable">
             <rect height="79" width="73.859375" y="-39.5" x="-36.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.9296875" x1="-36.9296875" class="divider"/>
@@ -186,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L15">
+        <a transform="translate(371.83203125, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L15">
           <g title="C" id="classId-C_0001436835384265552869-2" class="node default clickable">
             <rect height="79" width="71.171875" y="-39.5" x="-35.5859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.5859375" x1="-35.5859375" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L19">
+        <a transform="translate(245.60546875, 559.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L19">
           <g title="D" id="classId-C_0002199581366769423637-3" class="node default clickable">
             <rect height="79" width="81.28125" y="-39.5" x="-40.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.640625" x1="-40.640625" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7">
+        <a transform="translate(308.71875, 430.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7">
           <g title="C" id="classId-C_0001609446044604054241-4" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -253,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7">
+        <a transform="translate(251.0546875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7">
           <g title="B" id="classId-C_0000384927316081978893-5" class="node default clickable">
             <rect height="57" width="223.046875" y="-28.5" x="-111.5234375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="111.5234375" x1="-111.5234375" class="divider"/>
@@ -272,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L7">
+        <a transform="translate(151.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L7">
           <g title="A" id="classId-C_0001747493965420341251-6" class="node default clickable">
             <rect height="57" width="253.296875" y="-28.5" x="-126.6484375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="126.6484375" x1="-126.6484375" class="divider"/>
@@ -291,7 +291,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00033/t00033.cc#L23">
+        <a transform="translate(151.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00033/t00033.cc#L23">
           <g title="R" id="classId-C_0001866392706312766470-7" class="node default clickable">
             <rect height="79" width="287.65625" y="-39.5" x="-143.828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="143.828125" x1="-143.828125" class="divider"/>
diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md
index 8671ef16..9aa3cd9f 100644
--- a/docs/test_cases/t00034.md
+++ b/docs/test_cases/t00034.md
@@ -93,6 +93,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "operator==",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": true,
@@ -120,10 +121,12 @@ struct R {
             "line": 10,
             "translation_unit": "t00034.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         },
         {
           "access": "public",
+          "display_name": "operator!=",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": true,
@@ -151,6 +154,7 @@ struct R {
             "line": 11,
             "translation_unit": "t00034.cc"
           },
+          "template_parameters": [],
           "type": "bool"
         }
       ],
@@ -276,7 +280,7 @@ struct R {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00034::Void"
+          "type": "Void"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index a86819d1..1579e12b 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="243px" preserveAspectRatio="none" style="width:788px;height:243px;" version="1.1" viewBox="0 0 788 243" width="788px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1fy7gfu2usa5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fra3b83c7ybsb" 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,30 +9,30 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fy7gfu2usa5)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fra3b83c7ybsb)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="305" x="6" y="159"/>
       <ellipse cx="140.75" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M143.7188,180.6406 Q143.1406,180.9375 142.5,181.0781 Q141.8594,181.2344 141.1563,181.2344 Q138.6563,181.2344 137.3281,179.5938 Q136.0156,177.9375 136.0156,174.8125 Q136.0156,171.6875 137.3281,170.0313 Q138.6563,168.375 141.1563,168.375 Q141.8594,168.375 142.5,168.5313 Q143.1563,168.6875 143.7188,168.9844 L143.7188,171.7031 Q143.0938,171.125 142.5,170.8594 Q141.9063,170.5781 141.2813,170.5781 Q139.9375,170.5781 139.25,171.6563 Q138.5625,172.7188 138.5625,174.8125 Q138.5625,176.9063 139.25,177.9844 Q139.9375,179.0469 141.2813,179.0469 Q141.9063,179.0469 142.5,178.7813 Q143.0938,178.5 143.7188,177.9219 L143.7188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="161.25" y="179.1543">Void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="191" y2="191"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="197"/>
       <ellipse cx="17" cy="202" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L11" target="_top" title="operator!=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L11" xlink:show="new" xlink:title="operator!=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="273" x="26" y="205.2104">operator!=(const Void &amp;) constexpr const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="209.8047"/>
       <ellipse cx="17" cy="214.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L10" target="_top" title="operator==" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L10" xlink:show="new" xlink:title="operator==" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="279" x="26" y="218.0151">operator==(const Void &amp;) constexpr const : bool</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="310" y1="224.6094" y2="224.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fy7gfu2usa5)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fra3b83c7ybsb)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="493" y="172"/>
       <ellipse cx="508" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M510.9688,193.6406 Q510.3906,193.9375 509.75,194.0781 Q509.1094,194.2344 508.4063,194.2344 Q505.9063,194.2344 504.5781,192.5938 Q503.2656,190.9375 503.2656,187.8125 Q503.2656,184.6875 504.5781,183.0313 Q505.9063,181.375 508.4063,181.375 Q509.1094,181.375 509.75,181.5313 Q510.4063,181.6875 510.9688,181.9844 L510.9688,184.7031 Q510.3438,184.125 509.75,183.8594 Q509.1563,183.5781 508.5313,183.5781 Q507.1875,183.5781 506.5,184.6563 Q505.8125,185.7188 505.8125,187.8125 Q505.8125,189.9063 506.5,190.9844 Q507.1875,192.0469 508.5313,192.0469 Q509.1563,192.0469 509.75,191.7813 Q510.3438,191.5 510.9688,190.9219 L510.9688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="522" y="192.1543">lift_void</text>
@@ -41,8 +41,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494" x2="581" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fy7gfu2usa5)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fra3b83c7ybsb)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="484" y="21"/>
       <ellipse cx="499" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M501.9688,42.6406 Q501.3906,42.9375 500.75,43.0781 Q500.1094,43.2344 499.4063,43.2344 Q496.9063,43.2344 495.5781,41.5938 Q494.2656,39.9375 494.2656,36.8125 Q494.2656,33.6875 495.5781,32.0313 Q496.9063,30.375 499.4063,30.375 Q500.1094,30.375 500.75,30.5313 Q501.4063,30.6875 501.9688,30.9844 L501.9688,33.7031 Q501.3438,33.125 500.75,32.8594 Q500.1563,32.5781 499.5313,32.5781 Q498.1875,32.5781 497.5,33.6563 Q496.8125,34.7188 496.8125,36.8125 Q496.8125,38.9063 497.5,39.9844 Q498.1875,41.0469 499.5313,41.0469 Q500.1563,41.0469 500.75,40.7813 Q501.3438,40.5 501.9688,39.9219 L501.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="513" y="41.1543">lift_void</text>
@@ -51,8 +51,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="590" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fy7gfu2usa5)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fra3b83c7ybsb)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="346" y="172"/>
       <ellipse cx="361" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M363.9688,193.6406 Q363.3906,193.9375 362.75,194.0781 Q362.1094,194.2344 361.4063,194.2344 Q358.9063,194.2344 357.5781,192.5938 Q356.2656,190.9375 356.2656,187.8125 Q356.2656,184.6875 357.5781,183.0313 Q358.9063,181.375 361.4063,181.375 Q362.1094,181.375 362.75,181.5313 Q363.4063,181.6875 363.9688,181.9844 L363.9688,184.7031 Q363.3438,184.125 362.75,183.8594 Q362.1563,183.5781 361.5313,183.5781 Q360.1875,183.5781 359.5,184.6563 Q358.8125,185.7188 358.8125,187.8125 Q358.8125,189.9063 359.5,190.9844 Q360.1875,192.0469 361.5313,192.0469 Q362.1563,192.0469 362.75,191.7813 Q363.3438,191.5 363.9688,190.9219 L363.9688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="375" y="192.1543">drop_void</text>
@@ -61,8 +61,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="448" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fy7gfu2usa5)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fra3b83c7ybsb)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="212" y="21"/>
       <ellipse cx="227" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M229.9688,42.6406 Q229.3906,42.9375 228.75,43.0781 Q228.1094,43.2344 227.4063,43.2344 Q224.9063,43.2344 223.5781,41.5938 Q222.2656,39.9375 222.2656,36.8125 Q222.2656,33.6875 223.5781,32.0313 Q224.9063,30.375 227.4063,30.375 Q228.1094,30.375 228.75,30.5313 Q229.4063,30.6875 229.9688,30.9844 L229.9688,33.7031 Q229.3438,33.125 228.75,32.8594 Q228.1563,32.5781 227.5313,32.5781 Q226.1875,32.5781 225.5,33.6563 Q224.8125,34.7188 224.8125,36.8125 Q224.8125,38.9063 225.5,39.9844 Q226.1875,41.0469 227.5313,41.0469 Q228.1563,41.0469 228.75,40.7813 Q229.3438,40.5 229.9688,39.9219 L229.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="241" y="41.1543">drop_void</text>
@@ -71,34 +71,34 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="334" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fy7gfu2usa5)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fra3b83c7ybsb)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="681.5" y="172"/>
       <ellipse cx="696.5" cy="188" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M699.4688,193.6406 Q698.8906,193.9375 698.25,194.0781 Q697.6094,194.2344 696.9063,194.2344 Q694.4063,194.2344 693.0781,192.5938 Q691.7656,190.9375 691.7656,187.8125 Q691.7656,184.6875 693.0781,183.0313 Q694.4063,181.375 696.9063,181.375 Q697.6094,181.375 698.25,181.5313 Q698.9063,181.6875 699.4688,181.9844 L699.4688,184.7031 Q698.8438,184.125 698.25,183.8594 Q697.6563,183.5781 697.0313,183.5781 Q695.6875,183.5781 695,184.6563 Q694.3125,185.7188 694.3125,187.8125 Q694.3125,189.9063 695,190.9844 Q695.6875,192.0469 697.0313,192.0469 Q697.6563,192.0469 698.25,191.7813 Q698.8438,191.5 699.4688,190.9219 L699.4688,193.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="710.5" y="192.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="204" y2="204"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="682.5" x2="720.5" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fy7gfu2usa5)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fra3b83c7ybsb)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="626" y="8"/>
       <ellipse cx="693.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M696.2188,29.6406 Q695.6406,29.9375 695,30.0781 Q694.3594,30.2344 693.6563,30.2344 Q691.1563,30.2344 689.8281,28.5938 Q688.5156,26.9375 688.5156,23.8125 Q688.5156,20.6875 689.8281,19.0313 Q691.1563,17.375 693.6563,17.375 Q694.3594,17.375 695,17.5313 Q695.6563,17.6875 696.2188,17.9844 L696.2188,20.7031 Q695.5938,20.125 695,19.8594 Q694.4063,19.5781 693.7813,19.5781 Q692.4375,19.5781 691.75,20.6563 Q691.0625,21.7188 691.0625,23.8125 Q691.0625,25.9063 691.75,26.9844 Q692.4375,28.0469 693.7813,28.0469 Q694.4063,28.0469 695,27.7813 Q695.5938,27.5 696.2188,26.9219 L696.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="713.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="627" x2="776" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="632" y="54"/>
       <ellipse cx="637" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="646" y="62.2104">la : lift_void_t&lt;A&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="632" y="66.8047"/>
       <ellipse cx="637" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="646" y="75.0151">lv : lift_void_t&lt;void&gt; *</text>
     </a>
     <path d="M537.5,69.28 C537.5,91.26 537.5,124.76 537.5,151.66 " fill="none" id="C_0000126450862226197239-&gt;C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg
index 115ec573..bb57e50f 100644
--- a/docs/test_cases/t00034_class_mermaid.svg
+++ b/docs/test_cases/t00034_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(359.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L9">
+        <a transform="translate(359.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L9">
           <g title="Void" id="classId-C_0001704456490210873213-0" class="node default clickable">
             <rect height="101" width="371.203125" y="-50.5" x="-185.6015625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="185.6015625" x1="-185.6015625" class="divider"/>
@@ -131,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L16">
+        <a transform="translate(71.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L16">
           <g title="lift_void" id="classId-C_0000867472442996685316-1" class="node default clickable">
             <rect height="57" width="104.796875" y="-28.5" x="-52.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="52.3984375" x1="-52.3984375" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L20">
+        <a transform="translate(71.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L20">
           <g title="lift_void" id="classId-C_0000126450862226197239-2" class="node default clickable">
             <rect height="57" width="127.921875" y="-28.5" x="-63.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.9609375" x1="-63.9609375" class="divider"/>
@@ -169,7 +169,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(655.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L33">
+        <a transform="translate(655.9609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L33">
           <g title="drop_void" id="classId-C_0001578745816100337706-3" class="node default clickable">
             <rect height="57" width="120.796875" y="-28.5" x="-60.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.3984375" x1="-60.3984375" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(507.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L37">
+        <a transform="translate(507.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L37">
           <g title="drop_void" id="classId-C_0001849836134504075115-4" class="node default clickable">
             <rect height="57" width="144.5" y="-28.5" x="-72.25" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.25" x1="-72.25" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(820.14453125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L43">
+        <a transform="translate(820.14453125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L43">
           <g title="A" id="classId-C_0001383912907884688827-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -226,7 +226,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(820.14453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00034/t00034.cc#L45">
+        <a transform="translate(820.14453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00034/t00034.cc#L45">
           <g title="R" id="classId-C_0001713991735741265309-6" class="node default clickable">
             <rect height="101" width="164.875" y="-50.5" x="-82.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="82.4375" x1="-82.4375" class="divider"/>
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index e7e696be..d99c35d6 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="f1h18dog5m25uo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1jcbtcrz12w4e" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h18dog5m25uo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcbtcrz12w4e)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h18dog5m25uo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcbtcrz12w4e)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h18dog5m25uo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcbtcrz12w4e)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h18dog5m25uo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcbtcrz12w4e)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h18dog5m25uo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcbtcrz12w4e)" 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/t00035_class_mermaid.svg b/docs/test_cases/t00035_class_mermaid.svg
index 5c19a2c3..d4b9b5a7 100644
--- a/docs/test_cases/t00035_class_mermaid.svg
+++ b/docs/test_cases/t00035_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L4">
+        <a transform="translate(29.5703125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L4">
           <g title="Top" id="classId-C_0002241062883697294772-0" class="node default clickable">
             <rect height="57" width="43.140625" y="-28.5" x="-21.5703125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="21.5703125" x1="-21.5703125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L6">
+        <a transform="translate(123.3046875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L6">
           <g title="Left" id="classId-C_0000242562856080127946-1" class="node default clickable">
             <rect height="57" width="44.328125" y="-28.5" x="-22.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="22.1640625" x1="-22.1640625" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L8">
+        <a transform="translate(228.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L8">
           <g title="Center" id="classId-C_0001933304541849408421-2" class="node default clickable">
             <rect height="57" width="65.6875" y="-28.5" x="-32.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.84375" x1="-32.84375" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L10">
+        <a transform="translate(346.6484375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L10">
           <g title="Bottom" id="classId-C_0001646691079607377420-3" class="node default clickable">
             <rect height="57" width="70.984375" y="-28.5" x="-35.4921875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.4921875" x1="-35.4921875" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00035/t00035.cc#L12">
+        <a transform="translate(460.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00035/t00035.cc#L12">
           <g title="Right" id="classId-C_0000200121820090372322-4" class="node default clickable">
             <rect height="57" width="55.875" y="-28.5" x="-27.9375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.9375" x1="-27.9375" class="divider"/>
diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md
index eabe606f..2b45b103 100644
--- a/docs/test_cases/t00036.md
+++ b/docs/test_cases/t00036.md
@@ -81,7 +81,7 @@ struct DImpl : public ns2::ns22::D { };
             "blue",
             "yellow"
           ],
-          "display_name": "ns1::E",
+          "display_name": "E",
           "id": "2144761953049158478",
           "is_nested": false,
           "name": "E",
@@ -99,7 +99,7 @@ struct DImpl : public ns2::ns22::D { };
           "elements": [
             {
               "bases": [],
-              "display_name": "ns1::ns11::A<T>",
+              "display_name": "A<T>",
               "id": "571573305652194946",
               "is_abstract": false,
               "is_nested": false,
@@ -144,7 +144,7 @@ struct DImpl : public ns2::ns22::D { };
               "elements": [
                 {
                   "bases": [],
-                  "display_name": "ns1::ns11::ns111::B",
+                  "display_name": "B",
                   "id": "1964031933563607376",
                   "is_abstract": false,
                   "is_nested": false,
@@ -183,7 +183,7 @@ struct DImpl : public ns2::ns22::D { };
             },
             {
               "bases": [],
-              "display_name": "ns1::ns11::A<int>",
+              "display_name": "A<int>",
               "id": "1832710427462319797",
               "is_abstract": false,
               "is_nested": false,
@@ -226,7 +226,7 @@ struct DImpl : public ns2::ns22::D { };
           "elements": [
             {
               "bases": [],
-              "display_name": "ns2::ns22::C",
+              "display_name": "C",
               "id": "2038956882066165590",
               "is_abstract": false,
               "is_nested": false,
@@ -253,25 +253,6 @@ struct DImpl : public ns2::ns22::D { };
       ],
       "name": "ns2",
       "type": "namespace"
-    },
-    {
-      "display_name": "ns3",
-      "elements": [
-        {
-          "display_name": "ns33",
-          "elements": [
-            {
-              "display_name": "detail",
-              "name": "detail",
-              "type": "namespace"
-            }
-          ],
-          "name": "ns33",
-          "type": "namespace"
-        }
-      ],
-      "name": "ns3",
-      "type": "namespace"
     }
   ],
   "name": "t00036_class",
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index c1b0fd4f..b5969fcf 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="fkrpvlu1r3a5w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fy304p9bjdvpq" 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(#fkrpvlu1r3a5w)" 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(#fy304p9bjdvpq)" 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(#fkrpvlu1r3a5w)" 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(#fy304p9bjdvpq)" 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(#fkrpvlu1r3a5w)" 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(#fy304p9bjdvpq)" 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(#fkrpvlu1r3a5w)" 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(#fy304p9bjdvpq)" 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(#fkrpvlu1r3a5w)" 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(#fy304p9bjdvpq)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkrpvlu1r3a5w)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy304p9bjdvpq)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkrpvlu1r3a5w)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy304p9bjdvpq)" 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>
@@ -44,15 +44,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="452" y2="452"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="458"/>
       <ellipse cx="179" cy="463" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="466.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkrpvlu1r3a5w)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy304p9bjdvpq)" 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>
@@ -61,23 +61,23 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkrpvlu1r3a5w)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy304p9bjdvpq)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="185.5" y2="185.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="191.5"/>
       <ellipse cx="153" cy="196.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="199.7104">a_int : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkrpvlu1r3a5w)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fy304p9bjdvpq)" 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/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg
index 068676d5..46fdec12 100644
--- a/docs/test_cases/t00036_class_mermaid.svg
+++ b/docs/test_cases/t00036_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L6">
+        <a transform="translate(68.875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L6">
           <g title="E" id="classId-C_0002144761953049158478-0" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -107,7 +107,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0000571573305652194946-1" class="node default clickable">
             <rect height="79" width="139.484375" y="-39.5" x="-69.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.7421875" x1="-69.7421875" class="divider"/>
@@ -131,7 +131,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L16">
+        <a transform="translate(262.390625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L16">
           <g title="B" id="classId-C_0001964031933563607376-2" class="node default clickable">
             <rect height="79" width="165.28125" y="-39.5" x="-82.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="82.640625" x1="-82.640625" class="divider"/>
@@ -155,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L10">
+        <a transform="translate(262.390625, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L10">
           <g title="A" id="classId-C_0001832710427462319797-3" class="node default clickable">
             <rect height="57" width="149.265625" y="-28.5" x="-74.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6328125" x1="-74.6328125" class="divider"/>
@@ -174,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00036/t00036.cc#L28">
+        <a transform="translate(450.984375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00036/t00036.cc#L28">
           <g title="C" id="classId-C_0002038956882066165590-4" class="node default clickable">
             <rect height="57" width="111.90625" y="-28.5" x="-55.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.953125" x1="-55.953125" class="divider"/>
diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md
index f31e2e0d..0c5f56f3 100644
--- a/docs/test_cases/t00037.md
+++ b/docs/test_cases/t00037.md
@@ -250,6 +250,7 @@ struct A {
       "methods": [
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -272,6 +273,7 @@ struct A {
             "line": 21,
             "translation_unit": "t00037.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index a73acd26..67e7bb02 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="f1rzmm8kkx0ts0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1vanddojp40zk" 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,106 +9,106 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rzmm8kkx0ts0)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vanddojp40zk)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rzmm8kkx0ts0)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vanddojp40zk)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="350" y2="350"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="356"/>
       <ellipse cx="17" cy="361" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="364.2104">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="368.8047"/>
       <ellipse cx="17" cy="373.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="377.0151">x : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="381.6094"/>
       <ellipse cx="17" cy="386.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="389.8198">y : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="394.4141"/>
       <ellipse cx="17" cy="399.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="402.6245">z : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rzmm8kkx0ts0)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vanddojp40zk)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="362.5" y2="362.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="368.5"/>
       <ellipse cx="188" cy="373.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="376.7104">c : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="381.3047"/>
       <ellipse cx="188" cy="386.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="389.5151">h : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rzmm8kkx0ts0)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vanddojp40zk)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="131" y="54.2104">A() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="122" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">st : ST</text>
     </a>
     <path d="M106.32,243.96 C102.05,250.09 98.15,256.5 95,263 C87.97,277.51 83.26,294.41 80.13,309.92 " fill="none" id="C_0000011203041379038775&lt;-C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg
index 9a14e015..d3b5982b 100644
--- a/docs/test_cases/t00037_class_mermaid.svg
+++ b/docs/test_cases/t00037_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L4">
+        <a transform="translate(164.57421875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L4">
           <g title="ST" id="classId-C_0000011203041379038775-0" class="node default clickable">
             <rect height="101" width="275.140625" y="-50.5" x="-137.5703125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="137.5703125" x1="-137.5703125" class="divider"/>
@@ -119,7 +119,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L6">
+        <a transform="translate(79.9453125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L6">
           <g title="ST##(dimensions)" id="classId-C_0001980820317972901050-1" class="node default clickable">
             <rect height="145" width="143.890625" y="-72.5" x="-71.9453125" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="71.9453125" x1="-71.9453125" class="divider"/>
@@ -158,7 +158,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L14">
+        <a transform="translate(249.203125, 418.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L14">
           <g title="ST##(units)" id="classId-C_0001811145508890403377-2" class="node default clickable">
             <rect height="101" width="94.625" y="-50.5" x="-47.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="47.3125" x1="-47.3125" class="divider"/>
@@ -187,7 +187,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00037/t00037.cc#L20">
+        <a transform="translate(164.57421875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00037/t00037.cc#L20">
           <g title="A" id="classId-C_0001322794181774144954-3" class="node default clickable">
             <rect height="101" width="88.359375" y="-50.5" x="-44.1796875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="44.1796875" x1="-44.1796875" class="divider"/>
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index dd937859..203e1ee6 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="f1ak5vvytm49h8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fq5z28br9ampy" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="276.5" y2="276.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="282.5"/>
       <ellipse cx="1857" cy="287.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="290.7104">key : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ak5vvytm49h8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq5z28br9ampy)" 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/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg
index dab3e309..a54d1db3 100644
--- a/docs/test_cases/t00038_class_mermaid.svg
+++ b/docs/test_cases/t00038_class_mermaid.svg
@@ -202,7 +202,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L8">
+        <a transform="translate(321.546875, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L8">
           <g title="color_t" id="classId-C_0000566782399856868761-0" class="node default clickable">
             <rect height="145" width="191.90625" y="-72.5" x="-95.953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="95.953125" x1="-95.953125" class="divider"/>
@@ -236,7 +236,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L10">
+        <a transform="translate(331.546875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L10">
           <g title="E" id="classId-C_0001642222718760881014-1" class="node default clickable">
             <rect height="57" width="149.234375" y="-28.5" x="-74.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.6171875" x1="-74.6171875" class="divider"/>
@@ -255,7 +255,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L20">
+        <a transform="translate(2218.75, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L20">
           <g title="property_t" id="classId-C_0000007376951310260829-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -289,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L22">
+        <a transform="translate(959.765625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L22">
           <g title="A" id="classId-C_0000790040432414172612-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -308,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L23">
+        <a transform="translate(1570.2265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L23">
           <g title="B" id="classId-C_0001295970068907562690-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -327,7 +327,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L24">
+        <a transform="translate(2297.171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L24">
           <g title="C" id="classId-C_0000154510361779680983-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -346,7 +346,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L26">
+        <a transform="translate(2494.015625, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L26">
           <g title="key_t" id="classId-C_0000137163683637529037-6" class="node default clickable">
             <rect height="79" width="131.9375" y="-39.5" x="-65.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.96875" x1="-65.96875" class="divider"/>
@@ -370,7 +370,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L30">
+        <a transform="translate(806.14453125, 294.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L30">
           <g title="map" id="classId-C_0001917560728132448300-7" class="node default clickable">
             <rect height="57" width="76.359375" y="-28.5" x="-38.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.1796875" x1="-38.1796875" class="divider"/>
@@ -389,7 +389,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L34">
+        <a transform="translate(331.546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L34">
           <g title="map" id="classId-C_0001664022047310891203-8" class="node default clickable">
             <rect height="57" width="647.09375" y="-28.5" x="-323.546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="323.546875" x1="-323.546875" class="divider"/>
@@ -408,7 +408,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L37">
+        <a transform="translate(959.765625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L37">
           <g title="map" id="classId-C_0000307700801045535833-9" class="node default clickable">
             <rect height="57" width="509.34375" y="-28.5" x="-254.671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="254.671875" x1="-254.671875" class="divider"/>
@@ -427,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L41">
+        <a transform="translate(1570.2265625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L41">
           <g title="map" id="classId-C_0000548231528417484191-10" class="node default clickable">
             <rect height="57" width="611.578125" y="-28.5" x="-305.7890625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="305.7890625" x1="-305.7890625" class="divider"/>
@@ -446,7 +446,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00038/t00038.cc#L46">
+        <a transform="translate(2297.171875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00038/t00038.cc#L46">
           <g title="map" id="classId-C_0001510200402118706005-11" class="node default clickable">
             <rect height="57" width="742.3125" y="-28.5" x="-371.15625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="371.15625" x1="-371.15625" class="divider"/>
diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md
index 6b60f9e7..90b976fd 100644
--- a/docs/test_cases/t00039.md
+++ b/docs/test_cases/t00039.md
@@ -657,13 +657,6 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
       "source": "1761969273600680013",
       "type": "extension"
     },
-    {
-      "access": "public",
-      "destination": "247983380974491424",
-      "label": "b",
-      "source": "2158483243842147804",
-      "type": "association"
-    },
     {
       "access": "public",
       "destination": "1761969273600680013",
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index 8eecc125..faafc13d 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="f1mqbsll0vqt3t" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18wqo9upvzgun" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="290" y2="290"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="296"/>
       <ellipse cx="270" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="304.2104">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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>
@@ -106,15 +106,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="458" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">t : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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>
@@ -123,15 +123,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="175"/>
       <ellipse cx="378.5" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="183.2104">m : M *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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>
@@ -140,15 +140,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="169" y2="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="175"/>
       <ellipse cx="516" cy="180" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="183.2104">m : M *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mqbsll0vqt3t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18wqo9upvzgun)" 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>
@@ -157,11 +157,11 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="290" y2="290"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="296"/>
       <ellipse cx="368.5" cy="301" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="304.2104">n : N *</text>
     </a>
     <path d="M34.31,82.88 C33.42,100.62 32.42,120.44 31.67,135.33 " fill="none" id="C_0000241234977032861936&lt;-C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg
index f1deb374..52d47311 100644
--- a/docs/test_cases/t00039_class_mermaid.svg
+++ b/docs/test_cases/t00039_class_mermaid.svg
@@ -184,7 +184,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L6">
+        <a transform="translate(27.0546875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L6">
           <g title="C" id="classId-C_0000241234977032861936-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L8">
+        <a transform="translate(109.171875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L8">
           <g title="D" id="classId-C_0001975187139659616784-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L10">
+        <a transform="translate(200.84375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L10">
           <g title="E" id="classId-C_0001959131184346890363-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L16">
+        <a transform="translate(27.0546875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L16">
           <g title="CD" id="classId-C_0000850483622527996929-3" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -260,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L18">
+        <a transform="translate(116.28125, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L18">
           <g title="DE" id="classId-C_0001316022308303681160-4" class="node default clickable">
             <rect height="57" width="37.234375" y="-28.5" x="-18.6171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="18.6171875" x1="-18.6171875" class="divider"/>
@@ -279,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L20">
+        <a transform="translate(210.84375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L20">
           <g title="CDE" id="classId-C_0001877487144594774465-5" class="node default clickable">
             <rect height="57" width="48.78125" y="-28.5" x="-24.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.390625" x1="-24.390625" class="divider"/>
@@ -298,7 +298,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L22">
+        <a transform="translate(304.2890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L22">
           <g title="A" id="classId-C_0001051171525946759825-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -317,7 +317,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L24">
+        <a transform="translate(304.2890625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L24">
           <g title="AA" id="classId-C_0001761969273600680013-7" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -336,7 +336,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L26">
+        <a transform="translate(304.2890625, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L26">
           <g title="AAA" id="classId-C_0002158483243842147804-8" class="node default clickable">
             <rect height="79" width="57.25" y="-39.5" x="-28.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.625" x1="-28.625" class="divider"/>
@@ -360,7 +360,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L31">
+        <a transform="translate(304.2890625, 423.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L31">
           <g title="AAAA" id="classId-C_0001857294881176816154-9" class="node default clickable">
             <rect height="57" width="99.453125" y="-28.5" x="-49.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="49.7265625" x1="-49.7265625" class="divider"/>
@@ -379,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L39">
+        <a transform="translate(542.7109375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L39">
           <g title="F" id="classId-C_0000955785395599769805-10" class="node default clickable">
             <rect height="79" width="91.46875" y="-39.5" x="-45.734375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="45.734375" x1="-45.734375" class="divider"/>
@@ -403,7 +403,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L43">
+        <a transform="translate(454.421875, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L43">
           <g title="FF" id="classId-C_0001321996888067531304-11" class="node default clickable">
             <rect height="79" width="117.234375" y="-39.5" x="-58.6171875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -427,7 +427,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L47">
+        <a transform="translate(622.109375, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L47">
           <g title="FE" id="classId-C_0002008055732881129924-12" class="node default clickable">
             <rect height="79" width="118.140625" y="-39.5" x="-59.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="59.0703125" x1="-59.0703125" class="divider"/>
@@ -451,7 +451,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00039/t00039.cc#L51">
+        <a transform="translate(454.421875, 305.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00039/t00039.cc#L51">
           <g title="FFF" id="classId-C_0001617455840736919039-13" class="node default clickable">
             <rect height="79" width="143.015625" y="-39.5" x="-71.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="71.5078125" x1="-71.5078125" class="divider"/>
diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md
index fe1d5978..cbd747ec 100644
--- a/docs/test_cases/t00040.md
+++ b/docs/test_cases/t00040.md
@@ -107,6 +107,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "get_a",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -129,6 +130,7 @@ struct R {
             "line": 7,
             "translation_unit": "t00040.cc"
           },
+          "template_parameters": [],
           "type": "int"
         }
       ],
@@ -217,6 +219,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "get_aaa",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -239,6 +242,7 @@ struct R {
             "line": 24,
             "translation_unit": "t00040.cc"
           },
+          "template_parameters": [],
           "type": "int"
         }
       ],
@@ -266,6 +270,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -293,6 +298,7 @@ struct R {
             "line": 32,
             "translation_unit": "t00040.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -322,12 +328,6 @@ struct R {
       "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 d3dcf1c1..d2289705 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="f19618vrnngehj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1in4tn3cqo1g5" 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,70 +9,70 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19618vrnngehj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1in4tn3cqo1g5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <ellipse cx="24" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L7" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L7" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="54.2104">get_a() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <polygon fill="none" points="24,66.8047,28,70.8047,24,74.8047,20,70.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">ii_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19618vrnngehj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1in4tn3cqo1g5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19618vrnngehj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1in4tn3cqo1g5)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L24" target="_top" title="get_aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L24" xlink:show="new" xlink:title="get_aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="296.2104">get_aaa() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="308.8047"/>
       <ellipse cx="17" cy="313.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="317.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19618vrnngehj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1in4tn3cqo1g5)" 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>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="46.5" y2="46.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="145" y="52.5"/>
       <ellipse cx="150" cy="57.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="89" x="159" y="60.7104">foo(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="140" x2="253" y1="67.3047" y2="67.3047"/>
diff --git a/docs/test_cases/t00040_class_mermaid.svg b/docs/test_cases/t00040_class_mermaid.svg
index f6c2b035..6d7ff7ca 100644
--- a/docs/test_cases/t00040_class_mermaid.svg
+++ b/docs/test_cases/t00040_class_mermaid.svg
@@ -74,7 +74,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L5">
+        <a transform="translate(69.5390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L5">
           <g title="A" id="classId-C_0000307580006083737677-0" class="node default clickable">
             <rect height="101" width="105.28125" y="-50.5" x="-52.640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.640625" x1="-52.640625" class="divider"/>
@@ -103,7 +103,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L18">
+        <a transform="translate(69.5390625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L18">
           <g title="AA" id="classId-C_0000534115812779766127-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -122,7 +122,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L22">
+        <a transform="translate(69.5390625, 316.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L22">
           <g title="AAA" id="classId-C_0000745371908432158369-2" class="node default clickable">
             <rect height="101" width="123.078125" y="-50.5" x="-61.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.5390625" x1="-61.5390625" class="divider"/>
@@ -151,7 +151,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00040/t00040.cc#L31">
+        <a transform="translate(239.046875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00040/t00040.cc#L31">
           <g title="R" id="classId-C_0001539035020975101539-3" class="node default clickable">
             <rect height="79" width="133.734375" y="-39.5" x="-66.8671875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="66.8671875" x1="-66.8671875" class="divider"/>
diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md
index d881e31d..3939dc15 100644
--- a/docs/test_cases/t00041.md
+++ b/docs/test_cases/t00041.md
@@ -238,6 +238,7 @@ struct NM : public N { };
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -265,6 +266,7 @@ struct NM : public N { };
             "line": 32,
             "translation_unit": "t00041.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -399,12 +401,6 @@ struct NM : public N { };
       "source": "1798851434286108347",
       "type": "association"
     },
-    {
-      "access": "public",
-      "destination": "648827958379389524",
-      "source": "175608867682236642",
-      "type": "dependency"
-    },
     {
       "access": "public",
       "destination": "2158730167547707264",
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index f4abf989..3bc42050 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="f1beag52gwvfli" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fh7gpefenf3xu" 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,107 +9,107 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="143" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">rr : RR *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="63" y="192.2104">foo(H * h) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="198.8047" y2="198.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="204.8047"/>
       <ellipse cx="54" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="213.0151">e : E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="217.6094"/>
       <ellipse cx="54" cy="222.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="225.8198">f : F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="230.4141"/>
       <ellipse cx="54" cy="235.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="238.6245">g : detail::G *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1beag52gwvfli)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fh7gpefenf3xu)" 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/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg
index bd2d2392..e8bcc9bf 100644
--- a/docs/test_cases/t00041_class_mermaid.svg
+++ b/docs/test_cases/t00041_class_mermaid.svg
@@ -130,7 +130,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L9">
+        <a transform="translate(142.734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L9">
           <g title="R" id="classId-C_0000775317088453163919-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -149,7 +149,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L13">
+        <a transform="translate(43.7265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L13">
           <g title="D" id="classId-C_0001798851434286108347-1" class="node default clickable">
             <rect height="79" width="71.453125" y="-39.5" x="-35.7265625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="35.7265625" x1="-35.7265625" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L17">
+        <a transform="translate(55.6171875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L17">
           <g title="E" id="classId-C_0002158730167547707264-2" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L19">
+        <a transform="translate(130.84375, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L19">
           <g title="F" id="classId-C_0000430600213408545846-3" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -211,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L27">
+        <a transform="translate(112.609375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L27">
           <g title="RR" id="classId-C_0000175608867682236642-4" class="node default clickable">
             <rect height="145" width="135.5" y="-72.5" x="-67.75" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="67.75" x1="-67.75" class="divider"/>
@@ -250,7 +250,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L35">
+        <a transform="translate(218.0703125, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L35">
           <g title="RRR" id="classId-C_0000819254010294444715-5" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -269,7 +269,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L38">
+        <a transform="translate(369.7578125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L38">
           <g title="N" id="classId-C_0000220253364661036147-6" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -288,7 +288,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L40">
+        <a transform="translate(268.53125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L40">
           <g title="NN" id="classId-C_0000618038667214398895-7" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -307,7 +307,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00041/t00041.cc#L42">
+        <a transform="translate(395.7578125, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00041/t00041.cc#L42">
           <g title="NM" id="classId-C_0001206750351408617127-8" class="node default clickable">
             <rect height="57" width="78.109375" y="-28.5" x="-39.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="39.0546875" x1="-39.0546875" class="divider"/>
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index 0bab593b..e7c23809 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="213px" preserveAspectRatio="none" style="width:489px;height:213px;" version="1.1" viewBox="0 0 489 213" width="489px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f16zr6calfdqoe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ennoav3ibdje" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16zr6calfdqoe)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="264" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ennoav3ibdje)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="264" y="14.5"/>
       <ellipse cx="279.45" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M282.4188,36.1406 Q281.8406,36.4375 281.2,36.5781 Q280.5594,36.7344 279.8563,36.7344 Q277.3563,36.7344 276.0281,35.0938 Q274.7156,33.4375 274.7156,30.3125 Q274.7156,27.1875 276.0281,25.5313 Q277.3563,23.875 279.8563,23.875 Q280.5594,23.875 281.2,24.0313 Q281.8563,24.1875 282.4188,24.4844 L282.4188,27.2031 Q281.7938,26.625 281.2,26.3594 Q280.6063,26.0781 279.9813,26.0781 Q278.6375,26.0781 277.95,27.1563 Q277.2625,28.2188 277.2625,30.3125 Q277.2625,32.4063 277.95,33.4844 Q278.6375,34.5469 279.9813,34.5469 Q280.6063,34.5469 281.2,34.2813 Q281.7938,34 282.4188,33.4219 L282.4188,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="293.55" y="34.6543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="265" x2="315" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="265" x2="315" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="270" y="60.5"/>
       <ellipse cx="275" cy="65.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="284" y="68.7104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16zr6calfdqoe)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="133" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ennoav3ibdje)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="133" y="142"/>
       <ellipse cx="152.05" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.0188,163.6406 Q154.4406,163.9375 153.8,164.0781 Q153.1594,164.2344 152.4563,164.2344 Q149.9563,164.2344 148.6281,162.5938 Q147.3156,160.9375 147.3156,157.8125 Q147.3156,154.6875 148.6281,153.0313 Q149.9563,151.375 152.4563,151.375 Q153.1594,151.375 153.8,151.5313 Q154.4563,151.6875 155.0188,151.9844 L155.0188,154.7031 Q154.3938,154.125 153.8,153.8594 Q153.2063,153.5781 152.5813,153.5781 Q151.2375,153.5781 150.55,154.6563 Q149.8625,155.7188 149.8625,157.8125 Q149.8625,159.9063 150.55,160.9844 Q151.2375,162.0469 152.5813,162.0469 Q153.2063,162.0469 153.8,161.7813 Q154.3938,161.5 155.0188,160.9219 L155.0188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.95" y="162.1543">A</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="134" x2="210" y1="174" y2="174"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="134" x2="210" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="139" y="188"/>
       <ellipse cx="144" cy="193" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="153" y="196.2104">a : void *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16zr6calfdqoe)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="20.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ennoav3ibdje)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="20.5" y="8"/>
       <ellipse cx="35.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M38.4688,29.6406 Q37.8906,29.9375 37.25,30.0781 Q36.6094,30.2344 35.9063,30.2344 Q33.4063,30.2344 32.0781,28.5938 Q30.7656,26.9375 30.7656,23.8125 Q30.7656,20.6875 32.0781,19.0313 Q33.4063,17.375 35.9063,17.375 Q36.6094,17.375 37.25,17.5313 Q37.9063,17.6875 38.4688,17.9844 L38.4688,20.7031 Q37.8438,20.125 37.25,19.8594 Q36.6563,19.5781 36.0313,19.5781 Q34.6875,19.5781 34,20.6563 Q33.3125,21.7188 33.3125,23.8125 Q33.3125,25.9063 34,26.9844 Q34.6875,28.0469 36.0313,28.0469 Q36.6563,28.0469 37.25,27.7813 Q37.8438,27.5 38.4688,26.9219 L38.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="49.5" y="28.1543">B</text>
@@ -53,22 +53,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="21.5" x2="82.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="21.5" x2="82.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="26.5" y="54"/>
       <ellipse cx="31.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="40.5" y="62.2104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="26.5" y="66.8047"/>
       <ellipse cx="31.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="40.5" y="75.0151">bb : K</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16zr6calfdqoe)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="246.5" y="148.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ennoav3ibdje)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="246.5" y="148.5"/>
       <ellipse cx="261.5" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M264.4688,170.1406 Q263.8906,170.4375 263.25,170.5781 Q262.6094,170.7344 261.9063,170.7344 Q259.4063,170.7344 258.0781,169.0938 Q256.7656,167.4375 256.7656,164.3125 Q256.7656,161.1875 258.0781,159.5313 Q259.4063,157.875 261.9063,157.875 Q262.6094,157.875 263.25,158.0313 Q263.9063,158.1875 264.4688,158.4844 L264.4688,161.2031 Q263.8438,160.625 263.25,160.3594 Q262.6563,160.0781 262.0313,160.0781 Q260.6875,160.0781 260,161.1563 Q259.3125,162.2188 259.3125,164.3125 Q259.3125,166.4063 260,167.4844 Q260.6875,168.5469 262.0313,168.5469 Q262.6563,168.5469 263.25,168.2813 Q263.8438,168 264.4688,167.4219 L264.4688,170.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="275.5" y="168.6543">A</text>
@@ -77,8 +77,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="247.5" x2="332.5" y1="180.5" y2="180.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="247.5" x2="332.5" y1="188.5" y2="188.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16zr6calfdqoe)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="369" y="148.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ennoav3ibdje)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="369" y="148.5"/>
       <ellipse cx="384" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M386.9688,170.1406 Q386.3906,170.4375 385.75,170.5781 Q385.1094,170.7344 384.4063,170.7344 Q381.9063,170.7344 380.5781,169.0938 Q379.2656,167.4375 379.2656,164.3125 Q379.2656,161.1875 380.5781,159.5313 Q381.9063,157.875 384.4063,157.875 Q385.1094,157.875 385.75,158.0313 Q386.4063,158.1875 386.9688,158.4844 L386.9688,161.2031 Q386.3438,160.625 385.75,160.3594 Q385.1563,160.0781 384.5313,160.0781 Q383.1875,160.0781 382.5,161.1563 Q381.8125,162.2188 381.8125,164.3125 Q381.8125,166.4063 382.5,167.4844 Q383.1875,168.5469 384.5313,168.5469 Q385.1563,168.5469 385.75,168.2813 Q386.3438,168 386.9688,167.4219 L386.9688,170.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="398" y="168.6543">A</text>
@@ -87,8 +87,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="474" y1="180.5" y2="180.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="474" y1="188.5" y2="188.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16zr6calfdqoe)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="6" y="148.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ennoav3ibdje)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="6" y="148.5"/>
       <ellipse cx="21" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,170.1406 Q23.3906,170.4375 22.75,170.5781 Q22.1094,170.7344 21.4063,170.7344 Q18.9063,170.7344 17.5781,169.0938 Q16.2656,167.4375 16.2656,164.3125 Q16.2656,161.1875 17.5781,159.5313 Q18.9063,157.875 21.4063,157.875 Q22.1094,157.875 22.75,158.0313 Q23.4063,158.1875 23.9688,158.4844 L23.9688,161.2031 Q23.3438,160.625 22.75,160.3594 Q22.1563,160.0781 21.5313,160.0781 Q20.1875,160.0781 19.5,161.1563 Q18.8125,162.2188 18.8125,164.3125 Q18.8125,166.4063 19.5,167.4844 Q20.1875,168.5469 21.5313,168.5469 Q22.1563,168.5469 22.75,168.2813 Q23.3438,168 23.9688,167.4219 L23.9688,170.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="168.6543">B</text>
diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg
index ff1bf41f..2a271c72 100644
--- a/docs/test_cases/t00042_class_mermaid.svg
+++ b/docs/test_cases/t00042_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000462160951579835462-0" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -126,7 +126,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L9">
+        <a transform="translate(47.0703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L9">
           <g title="A" id="classId-C_0001422802342059669545-1" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001414456934388678010-2" class="node default clickable">
             <rect height="101" width="69.25" y="-50.5" x="-34.625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="34.625" x1="-34.625" class="divider"/>
@@ -179,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5">
+        <a transform="translate(184.984375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000364538479078826988-3" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -198,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L5">
+        <a transform="translate(346, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L5">
           <g title="A" id="classId-C_0000496773262538580186-4" class="node default clickable">
             <rect height="57" width="124.34375" y="-28.5" x="-62.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -217,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00042/t00042.cc#L13">
+        <a transform="translate(509.6796875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00042/t00042.cc#L13">
           <g title="B" id="classId-C_0001833471931530161359-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md
index be2f8518..c5474e96 100644
--- a/docs/test_cases/t00043.md
+++ b/docs/test_cases/t00043.md
@@ -89,7 +89,7 @@ struct J {
       "elements": [
         {
           "bases": [],
-          "display_name": "dependants::A",
+          "display_name": "A",
           "id": "1454679300998460550",
           "is_abstract": false,
           "is_nested": false,
@@ -111,7 +111,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependants::B",
+          "display_name": "B",
           "id": "1972977265990430931",
           "is_abstract": false,
           "is_nested": false,
@@ -122,6 +122,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "b",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -149,6 +150,7 @@ struct J {
                 "line": 7,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -165,7 +167,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependants::BB",
+          "display_name": "BB",
           "id": "1906291555025945295",
           "is_abstract": false,
           "is_nested": false,
@@ -176,6 +178,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "bb",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -203,6 +206,7 @@ struct J {
                 "line": 11,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -219,7 +223,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependants::C",
+          "display_name": "C",
           "id": "823759225351121534",
           "is_abstract": false,
           "is_nested": false,
@@ -230,6 +234,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "c",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -257,6 +262,7 @@ struct J {
                 "line": 15,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -273,7 +279,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependants::D",
+          "display_name": "D",
           "id": "2277976215348279426",
           "is_abstract": false,
           "is_nested": false,
@@ -284,6 +290,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "d",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -311,10 +318,12 @@ struct J {
                 "line": 19,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             },
             {
               "access": "public",
+              "display_name": "dd",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -342,6 +351,7 @@ struct J {
                 "line": 20,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -358,7 +368,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependants::E",
+          "display_name": "E",
           "id": "1694685540293810116",
           "is_abstract": false,
           "is_nested": false,
@@ -369,6 +379,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "e",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -396,6 +407,7 @@ struct J {
                 "line": 24,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -419,7 +431,7 @@ struct J {
       "elements": [
         {
           "bases": [],
-          "display_name": "dependencies::G",
+          "display_name": "G",
           "id": "736400571183204899",
           "is_abstract": false,
           "is_nested": false,
@@ -441,7 +453,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependencies::GG",
+          "display_name": "GG",
           "id": "1522297681294871411",
           "is_abstract": false,
           "is_nested": false,
@@ -463,7 +475,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependencies::H",
+          "display_name": "H",
           "id": "1534191494825314170",
           "is_abstract": false,
           "is_nested": false,
@@ -474,6 +486,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "h",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -501,10 +514,12 @@ struct J {
                 "line": 37,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             },
             {
               "access": "public",
+              "display_name": "hh",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -532,6 +547,7 @@ struct J {
                 "line": 38,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -548,7 +564,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependencies::I",
+          "display_name": "I",
           "id": "97422543769740359",
           "is_abstract": false,
           "is_nested": false,
@@ -559,6 +575,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "i",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -586,6 +603,7 @@ struct J {
                 "line": 46,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -602,7 +620,7 @@ struct J {
         },
         {
           "bases": [],
-          "display_name": "dependencies::J",
+          "display_name": "J",
           "id": "1498530043106438011",
           "is_abstract": false,
           "is_nested": false,
@@ -613,6 +631,7 @@ struct J {
           "methods": [
             {
               "access": "public",
+              "display_name": "i",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -640,6 +659,7 @@ struct J {
                 "line": 50,
                 "translation_unit": "t00043.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 9499c538..af450399 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:512px;height:645px;" version="1.1" viewBox="0 0 512 645" width="512px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1qv0jcf61028b" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fk27j85ddd6rx" 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,167 +9,167 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1qv0jcf61028b)" points="22,24,122,24,129,46.2969,304,46.2969,304,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fk27j85ddd6rx)" points="22,24,122,24,129,46.2969,304,46.2969,304,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(#f1qv0jcf61028b)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fk27j85ddd6rx)" points="328,24,446,24,453,46.2969,490,46.2969,490,518.5,328,518.5,328,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="328" x2="453" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="332" y="38.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="144" y="569"/>
       <ellipse cx="159" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M161.9688,590.6406 Q161.3906,590.9375 160.75,591.0781 Q160.1094,591.2344 159.4063,591.2344 Q156.9063,591.2344 155.5781,589.5938 Q154.2656,587.9375 154.2656,584.8125 Q154.2656,581.6875 155.5781,580.0313 Q156.9063,578.375 159.4063,578.375 Q160.1094,578.375 160.75,578.5313 Q161.4063,578.6875 161.9688,578.9844 L161.9688,581.7031 Q161.3438,581.125 160.75,580.8594 Q160.1563,580.5781 159.5313,580.5781 Q158.1875,580.5781 157.5,581.6563 Q156.8125,582.7188 156.8125,584.8125 Q156.8125,586.9063 157.5,587.9844 Q158.1875,589.0469 159.5313,589.0469 Q160.1563,589.0469 160.75,588.7813 Q161.3438,588.5 161.9688,587.9219 L161.9688,590.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="173" y="589.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="601" y2="601"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145" x2="183" y1="609" y2="609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="184" y="448"/>
       <ellipse cx="227.8" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.7688,469.6406 Q230.1906,469.9375 229.55,470.0781 Q228.9094,470.2344 228.2063,470.2344 Q225.7063,470.2344 224.3781,468.5938 Q223.0656,466.9375 223.0656,463.8125 Q223.0656,460.6875 224.3781,459.0313 Q225.7063,457.375 228.2063,457.375 Q228.9094,457.375 229.55,457.5313 Q230.2063,457.6875 230.7688,457.9844 L230.7688,460.7031 Q230.1438,460.125 229.55,459.8594 Q228.9563,459.5781 228.3313,459.5781 Q226.9875,459.5781 226.3,460.6563 Q225.6125,461.7188 225.6125,463.8125 Q225.6125,465.9063 226.3,466.9844 Q226.9875,468.0469 228.3313,468.0469 Q228.9563,468.0469 229.55,467.7813 Q230.1438,467.5 230.7688,466.9219 L230.7688,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="248.2" y="468.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="190" y="486"/>
       <ellipse cx="195" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L7" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="204" y="494.2104">b(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="185" x2="287" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="111" x="37.5" y="448"/>
       <ellipse cx="80.85" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M83.8188,469.6406 Q83.2406,469.9375 82.6,470.0781 Q81.9594,470.2344 81.2563,470.2344 Q78.7563,470.2344 77.4281,468.5938 Q76.1156,466.9375 76.1156,463.8125 Q76.1156,460.6875 77.4281,459.0313 Q78.7563,457.375 81.2563,457.375 Q81.9594,457.375 82.6,457.5313 Q83.2563,457.6875 83.8188,457.9844 L83.8188,460.7031 Q83.1938,460.125 82.6,459.8594 Q82.0063,459.5781 81.3813,459.5781 Q80.0375,459.5781 79.35,460.6563 Q78.6625,461.7188 78.6625,463.8125 Q78.6625,465.9063 79.35,466.9844 Q80.0375,468.0469 81.3813,468.0469 Q82.0063,468.0469 82.6,467.7813 Q83.1938,467.5 83.8188,466.9219 L83.8188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="101.15" y="468.1543">BB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="480" y2="480"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="43.5" y="486"/>
       <ellipse cx="48.5" cy="491" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L11" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="57.5" y="494.2104">bb(A * a) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="38.5" x2="147.5" y1="500.8047" y2="500.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="170" y="320.5"/>
       <ellipse cx="213.8" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M216.7688,342.1406 Q216.1906,342.4375 215.55,342.5781 Q214.9094,342.7344 214.2063,342.7344 Q211.7063,342.7344 210.3781,341.0938 Q209.0656,339.4375 209.0656,336.3125 Q209.0656,333.1875 210.3781,331.5313 Q211.7063,329.875 214.2063,329.875 Q214.9094,329.875 215.55,330.0313 Q216.2063,330.1875 216.7688,330.4844 L216.7688,333.2031 Q216.1438,332.625 215.55,332.3594 Q214.9563,332.0781 214.3313,332.0781 Q212.9875,332.0781 212.3,333.1563 Q211.6125,334.2188 211.6125,336.3125 Q211.6125,338.4063 212.3,339.4844 Q212.9875,340.5469 214.3313,340.5469 Q214.9563,340.5469 215.55,340.2813 Q216.1438,340 216.7688,339.4219 L216.7688,342.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="234.2" y="340.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.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="176" y="358.5"/>
       <ellipse cx="181" cy="363.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="190" y="366.7104">c(B * b) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="171" x2="273" y1="373.3047" y2="373.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="77.5" y="180"/>
       <ellipse cx="132.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M135.2188,201.6406 Q134.6406,201.9375 134,202.0781 Q133.3594,202.2344 132.6563,202.2344 Q130.1563,202.2344 128.8281,200.5938 Q127.5156,198.9375 127.5156,195.8125 Q127.5156,192.6875 128.8281,191.0313 Q130.1563,189.375 132.6563,189.375 Q133.3594,189.375 134,189.5313 Q134.6563,189.6875 135.2188,189.9844 L135.2188,192.7031 Q134.5938,192.125 134,191.8594 Q133.4063,191.5781 132.7813,191.5781 Q131.4375,191.5781 130.75,192.6563 Q130.0625,193.7188 130.0625,195.8125 Q130.0625,197.9063 130.75,198.9844 Q131.4375,200.0469 132.7813,200.0469 Q133.4063,200.0469 134,199.7813 Q134.5938,199.5 135.2188,198.9219 L135.2188,201.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="152.75" y="200.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="212" y2="212"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="218"/>
       <ellipse cx="88.5" cy="223" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L19" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="97.5" y="226.2104">d(C * c) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="230.8047"/>
       <ellipse cx="88.5" cy="235.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L20" target="_top" title="dd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L20" xlink:show="new" xlink:title="dd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="97.5" y="239.0151">dd(BB * bb) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="78.5" x2="203.5" y1="245.6094" y2="245.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="88.5" y="59"/>
       <ellipse cx="132.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M135.7188,80.6406 Q135.1406,80.9375 134.5,81.0781 Q133.8594,81.2344 133.1563,81.2344 Q130.6563,81.2344 129.3281,79.5938 Q128.0156,77.9375 128.0156,74.8125 Q128.0156,71.6875 129.3281,70.0313 Q130.6563,68.375 133.1563,68.375 Q133.8594,68.375 134.5,68.5313 Q135.1563,68.6875 135.7188,68.9844 L135.7188,71.7031 Q135.0938,71.125 134.5,70.8594 Q133.9063,70.5781 133.2813,70.5781 Q131.9375,70.5781 131.25,71.6563 Q130.5625,72.7188 130.5625,74.8125 Q130.5625,76.9063 131.25,77.9844 Q131.9375,79.0469 133.2813,79.0469 Q133.9063,79.0469 134.5,78.7813 Q135.0938,78.5 135.7188,77.9219 L135.7188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="153.25" y="79.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="91" y2="91"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="94.5" y="97"/>
       <ellipse cx="99.5" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L24" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="108.5" y="105.2104">e(D * d) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="89.5" x2="192.5" y1="111.8047" y2="111.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="345.5" y="454.5"/>
       <ellipse cx="360.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M363.4688,476.1406 Q362.8906,476.4375 362.25,476.5781 Q361.6094,476.7344 360.9063,476.7344 Q358.4063,476.7344 357.0781,475.0938 Q355.7656,473.4375 355.7656,470.3125 Q355.7656,467.1875 357.0781,465.5313 Q358.4063,463.875 360.9063,463.875 Q361.6094,463.875 362.25,464.0313 Q362.9063,464.1875 363.4688,464.4844 L363.4688,467.2031 Q362.8438,466.625 362.25,466.3594 Q361.6563,466.0781 361.0313,466.0781 Q359.6875,466.0781 359,467.1563 Q358.3125,468.2188 358.3125,470.3125 Q358.3125,472.4063 359,473.4844 Q359.6875,474.5469 361.0313,474.5469 Q361.6563,474.5469 362.25,474.2813 Q362.8438,474 363.4688,473.4219 L363.4688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="374.5" y="474.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="346.5" x2="385.5" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="422" y="454.5"/>
       <ellipse cx="437" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M439.9688,476.1406 Q439.3906,476.4375 438.75,476.5781 Q438.1094,476.7344 437.4063,476.7344 Q434.9063,476.7344 433.5781,475.0938 Q432.2656,473.4375 432.2656,470.3125 Q432.2656,467.1875 433.5781,465.5313 Q434.9063,463.875 437.4063,463.875 Q438.1094,463.875 438.75,464.0313 Q439.4063,464.1875 439.9688,464.4844 L439.9688,467.2031 Q439.3438,466.625 438.75,466.3594 Q438.1563,466.0781 437.5313,466.0781 Q436.1875,466.0781 435.5,467.1563 Q434.8125,468.2188 434.8125,470.3125 Q434.8125,472.4063 435.5,473.4844 Q436.1875,474.5469 437.5313,474.5469 Q438.1563,474.5469 438.75,474.2813 Q439.3438,474 439.9688,473.4219 L439.9688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="451" y="474.6543">GG</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="423" x2="471" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="344.5" y="314"/>
       <ellipse cx="400.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M403.2188,335.6406 Q402.6406,335.9375 402,336.0781 Q401.3594,336.2344 400.6563,336.2344 Q398.1563,336.2344 396.8281,334.5938 Q395.5156,332.9375 395.5156,329.8125 Q395.5156,326.6875 396.8281,325.0313 Q398.1563,323.375 400.6563,323.375 Q401.3594,323.375 402,323.5313 Q402.6563,323.6875 403.2188,323.9844 L403.2188,326.7031 Q402.5938,326.125 402,325.8594 Q401.4063,325.5781 400.7813,325.5781 Q399.4375,325.5781 398.75,326.6563 Q398.0625,327.7188 398.0625,329.8125 Q398.0625,331.9063 398.75,332.9844 Q399.4375,334.0469 400.7813,334.0469 Q401.4063,334.0469 402,333.7813 Q402.5938,333.5 403.2188,332.9219 L403.2188,335.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="420.75" y="334.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="352"/>
       <ellipse cx="355.5" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L37" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="364.5" y="360.2104">h(G * g) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="350.5" y="364.8047"/>
       <ellipse cx="355.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L38" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L38" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="364.5" y="373.0151">hh(GG * gg) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="345.5" x2="472.5" y1="379.6094" y2="379.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="101" x="358.5" y="186.5"/>
       <ellipse cx="403.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M406.2188,208.1406 Q405.6406,208.4375 405,208.5781 Q404.3594,208.7344 403.6563,208.7344 Q401.1563,208.7344 399.8281,207.0938 Q398.5156,205.4375 398.5156,202.3125 Q398.5156,199.1875 399.8281,197.5313 Q401.1563,195.875 403.6563,195.875 Q404.3594,195.875 405,196.0313 Q405.6563,196.1875 406.2188,196.4844 L406.2188,199.2031 Q405.5938,198.625 405,198.3594 Q404.4063,198.0781 403.7813,198.0781 Q402.4375,198.0781 401.75,199.1563 Q401.0625,200.2188 401.0625,202.3125 Q401.0625,204.4063 401.75,205.4844 Q402.4375,206.5469 403.7813,206.5469 Q404.4063,206.5469 405,206.2813 Q405.5938,206 406.2188,205.4219 L406.2188,208.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.75" y="206.6543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="218.5" y2="218.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="364.5" y="224.5"/>
       <ellipse cx="369.5" cy="229.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L46" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L46" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="378.5" y="232.7104">i(H * h) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="359.5" x2="458.5" y1="239.3047" y2="239.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qv0jcf61028b)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fk27j85ddd6rx)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="363" y="59"/>
       <ellipse cx="403.65" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M406.6188,80.6406 Q406.0406,80.9375 405.4,81.0781 Q404.7594,81.2344 404.0563,81.2344 Q401.5563,81.2344 400.2281,79.5938 Q398.9156,77.9375 398.9156,74.8125 Q398.9156,71.6875 400.2281,70.0313 Q401.5563,68.375 404.0563,68.375 Q404.7594,68.375 405.4,68.5313 Q406.0563,68.6875 406.6188,68.9844 L406.6188,71.7031 Q405.9938,71.125 405.4,70.8594 Q404.8063,70.5781 404.1813,70.5781 Q402.8375,70.5781 402.15,71.6563 Q401.4625,72.7188 401.4625,74.8125 Q401.4625,76.9063 402.15,77.9844 Q402.8375,79.0469 404.1813,79.0469 Q404.8063,79.0469 405.4,78.7813 Q405.9938,78.5 406.6188,77.9219 L406.6188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="423.35" y="79.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="91" y2="91"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="369" y="97"/>
       <ellipse cx="374" cy="102" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="383" y="105.2104">i(I * i) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="364" x2="454" y1="111.8047" y2="111.8047"/>
diff --git a/docs/test_cases/t00043_class_mermaid.svg b/docs/test_cases/t00043_class_mermaid.svg
index 87ab9e85..33ef2ceb 100644
--- a/docs/test_cases/t00043_class_mermaid.svg
+++ b/docs/test_cases/t00043_class_mermaid.svg
@@ -174,7 +174,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L4">
+        <a transform="translate(162.890625, 596.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L4">
           <g title="A" id="classId-C_0001454679300998460550-0" class="node default clickable">
             <rect height="57" width="127" y="-28.5" x="-63.5" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L6">
+        <a transform="translate(71.5, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L6">
           <g title="B" id="classId-C_0001972977265990430931-1" class="node default clickable">
             <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -217,7 +217,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L10">
+        <a transform="translate(254.28125, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L10">
           <g title="BB" id="classId-C_0001906291555025945295-2" class="node default clickable">
             <rect height="79" width="138.5625" y="-39.5" x="-69.28125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="69.28125" x1="-69.28125" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L14">
+        <a transform="translate(71.5, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L14">
           <g title="C" id="classId-C_0000823759225351121534-3" class="node default clickable">
             <rect height="79" width="127" y="-39.5" x="-63.5" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.5" x1="-63.5" class="divider"/>
@@ -265,7 +265,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L18">
+        <a transform="translate(162.890625, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L18">
           <g title="D" id="classId-C_0002277976215348279426-4" class="node default clickable">
             <rect height="101" width="149.75" y="-50.5" x="-74.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -294,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L23">
+        <a transform="translate(162.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L23">
           <g title="E" id="classId-C_0001694685540293810116-5" class="node default clickable">
             <rect height="79" width="126.125" y="-39.5" x="-63.0625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -318,7 +318,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L32">
+        <a transform="translate(445.96875, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L32">
           <g title="G" id="classId-C_0000736400571183204899-6" class="node default clickable">
             <rect height="57" width="144.8125" y="-28.5" x="-72.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.40625" x1="-72.40625" class="divider"/>
@@ -337,7 +337,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L34">
+        <a transform="translate(647, 478.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L34">
           <g title="GG" id="classId-C_0001522297681294871411-7" class="node default clickable">
             <rect height="57" width="157.25" y="-28.5" x="-78.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="78.625" x1="-78.625" class="divider"/>
@@ -356,7 +356,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L36">
+        <a transform="translate(546.484375, 338.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L36">
           <g title="H" id="classId-C_0001534191494825314170-8" class="node default clickable">
             <rect height="101" width="153.296875" y="-50.5" x="-76.6484375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="76.6484375" x1="-76.6484375" class="divider"/>
@@ -385,7 +385,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L45">
+        <a transform="translate(546.484375, 187.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L45">
           <g title="I" id="classId-C_0000097422543769740359-9" class="node default clickable">
             <rect height="79" width="136.8125" y="-39.5" x="-68.40625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="68.40625" x1="-68.40625" class="divider"/>
@@ -409,7 +409,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00043/t00043.cc#L49">
+        <a transform="translate(546.484375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00043/t00043.cc#L49">
           <g title="J" id="classId-C_0001498530043106438011-10" class="node default clickable">
             <rect height="79" width="141.265625" y="-39.5" x="-70.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="70.6328125" x1="-70.6328125" class="divider"/>
diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md
index a4ecf101..08bb7e78 100644
--- a/docs/test_cases/t00044.md
+++ b/docs/test_cases/t00044.md
@@ -136,6 +136,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "sink",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -163,10 +164,12 @@ struct R {
             "line": 13,
             "translation_unit": "t00044.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "get_signal<CastTo>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -183,6 +186,14 @@ struct R {
           "is_virtual": false,
           "name": "get_signal",
           "parameters": [],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "CastTo",
+              "template_parameters": []
+            }
+          ],
           "type": "CastTo *"
         }
       ],
@@ -224,7 +235,7 @@ struct R {
               "template_parameters": []
             }
           ],
-          "type": "clanguml::t00044::signal_handler"
+          "type": "signal_handler"
         }
       ],
       "type": "class"
@@ -325,7 +336,7 @@ struct R {
               "type": "bool"
             }
           ],
-          "type": "clanguml::t00044::signal_handler"
+          "type": "signal_handler"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index 00f9794f..40b838ee 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="594px" preserveAspectRatio="none" style="width:517px;height:594px;" version="1.1" viewBox="0 0 517 594" width="517px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1m7mnrvs28a9h" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzyi4l8wmzfqx" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m7mnrvs28a9h)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L9" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzyi4l8wmzfqx)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="248" y="426"/>
       <ellipse cx="263" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M265.9688,447.6406 Q265.3906,447.9375 264.75,448.0781 Q264.1094,448.2344 263.4063,448.2344 Q260.9063,448.2344 259.5781,446.5938 Q258.2656,444.9375 258.2656,441.8125 Q258.2656,438.6875 259.5781,437.0313 Q260.9063,435.375 263.4063,435.375 Q264.1094,435.375 264.75,435.5313 Q265.4063,435.6875 265.9688,435.9844 L265.9688,438.7031 Q265.3438,438.125 264.75,437.8594 Q264.1563,437.5781 263.5313,437.5781 Q262.1875,437.5781 261.5,438.6563 Q260.8125,439.7188 260.8125,441.8125 Q260.8125,443.9063 261.5,444.9844 Q262.1875,446.0469 263.5313,446.0469 Q264.1563,446.0469 264.75,445.7813 Q265.3438,445.5 265.9688,444.9219 L265.9688,447.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="277" y="446.1543">signal_handler</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="458" y2="458"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="249" x2="456" y1="466" y2="466"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m7mnrvs28a9h)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L9" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L9" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzyi4l8wmzfqx)" height="94.4141" id="C_0000559574389062594251" style="stroke: #A80036; stroke-width: 1.5;" width="253" 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="25" x="35" y="275.1543">sink</text>
@@ -28,26 +28,26 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="192" x="69" y="264.1387">signal_handler&lt;Ret(Args...),A&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L13" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L13" xlink:show="new" xlink:title="sink" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="26" y="301.2104">sink(signal_t &amp; sh) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="258" y1="307.8047" y2="307.8047"/>
     <ellipse cx="17" cy="318.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="186" x="26" y="322.0151">get_signal&lt;CastTo&gt;() : CastTo *</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="258" y1="328.6094" y2="328.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="334.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="336.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L21" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L21" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="26" y="342.8198">signal : signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m7mnrvs28a9h)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzyi4l8wmzfqx)" height="48" id="C_0000103559998624864011" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="294" y="278"/>
       <ellipse cx="309" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M311.9688,299.6406 Q311.3906,299.9375 310.75,300.0781 Q310.1094,300.2344 309.4063,300.2344 Q306.9063,300.2344 305.5781,298.5938 Q304.2656,296.9375 304.2656,293.8125 Q304.2656,290.6875 305.5781,289.0313 Q306.9063,287.375 309.4063,287.375 Q310.1094,287.375 310.75,287.5313 Q311.4063,287.6875 311.9688,287.9844 L311.9688,290.7031 Q311.3438,290.125 310.75,289.8594 Q310.1563,289.5781 309.5313,289.5781 Q308.1875,289.5781 307.5,290.6563 Q306.8125,291.7188 306.8125,293.8125 Q306.8125,295.9063 307.5,296.9844 Q308.1875,298.0469 309.5313,298.0469 Q310.1563,298.0469 310.75,297.7813 Q311.3438,297.5 311.9688,296.9219 L311.9688,299.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="323" y="298.1543">signal_handler</text>
@@ -56,8 +56,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="310" y2="310"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295" x2="502" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m7mnrvs28a9h)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzyi4l8wmzfqx)" height="48" id="C_0001718007222067272862" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="138" y="146"/>
       <ellipse cx="153" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.9688,167.6406 Q155.3906,167.9375 154.75,168.0781 Q154.1094,168.2344 153.4063,168.2344 Q150.9063,168.2344 149.5781,166.5938 Q148.2656,164.9375 148.2656,161.8125 Q148.2656,158.6875 149.5781,157.0313 Q150.9063,155.375 153.4063,155.375 Q154.1094,155.375 154.75,155.5313 Q155.4063,155.6875 155.9688,155.9844 L155.9688,158.7031 Q155.3438,158.125 154.75,157.8594 Q154.1563,157.5781 153.5313,157.5781 Q152.1875,157.5781 151.5,158.6563 Q150.8125,159.7188 150.8125,161.8125 Q150.8125,163.9063 151.5,164.9844 Q152.1875,166.0469 153.5313,166.0469 Q154.1563,166.0469 154.75,165.7813 Q155.3438,165.5 155.9688,164.9219 L155.9688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="167" y="166.1543">sink</text>
@@ -66,23 +66,23 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="139" x2="390" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m7mnrvs28a9h)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzyi4l8wmzfqx)" height="60.8047" id="C_0001644484569399365272" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="121" 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="8" x="276.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="122" x2="407" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="127" y="54"/>
       <ellipse cx="132" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L34" target="_top" title="sink1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L34" xlink:show="new" xlink:title="sink1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="261" x="141" y="62.2104">sink1 : sink&lt;signal_handler&lt;void (int),bool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m7mnrvs28a9h)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L6" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L6" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzyi4l8wmzfqx)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="279.5" y="535"/>
       <ellipse cx="294.5" cy="551" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M297.4688,556.6406 Q296.8906,556.9375 296.25,557.0781 Q295.6094,557.2344 294.9063,557.2344 Q292.4063,557.2344 291.0781,555.5938 Q289.7656,553.9375 289.7656,550.8125 Q289.7656,547.6875 291.0781,546.0313 Q292.4063,544.375 294.9063,544.375 Q295.6094,544.375 296.25,544.5313 Q296.9063,544.6875 297.4688,544.9844 L297.4688,547.7031 Q296.8438,547.125 296.25,546.8594 Q295.6563,546.5781 295.0313,546.5781 Q293.6875,546.5781 293,547.6563 Q292.3125,548.7188 292.3125,550.8125 Q292.3125,552.9063 293,553.9844 Q293.6875,555.0469 295.0313,555.0469 Q295.6563,555.0469 296.25,554.7813 Q296.8438,554.5 297.4688,553.9219 L297.4688,556.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="308.5" y="555.1543">signal_handler</text>
@@ -91,8 +91,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="567" y2="567"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="424.5" y1="575" y2="575"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m7mnrvs28a9h)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzyi4l8wmzfqx)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="98.5" y="426"/>
       <ellipse cx="113.5" cy="442" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M116.4688,447.6406 Q115.8906,447.9375 115.25,448.0781 Q114.6094,448.2344 113.9063,448.2344 Q111.4063,448.2344 110.0781,446.5938 Q108.7656,444.9375 108.7656,441.8125 Q108.7656,438.6875 110.0781,437.0313 Q111.4063,435.375 113.9063,435.375 Q114.6094,435.375 115.25,435.5313 Q115.9063,435.6875 116.4688,435.9844 L116.4688,438.7031 Q115.8438,438.125 115.25,437.8594 Q114.6563,437.5781 114.0313,437.5781 Q112.6875,437.5781 112,438.6563 Q111.3125,439.7188 111.3125,441.8125 Q111.3125,443.9063 112,444.9844 Q112.6875,446.0469 114.0313,446.0469 Q114.6563,446.0469 115.25,445.7813 Q115.8438,445.5 116.4688,444.9219 L116.4688,447.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="127.5" y="446.1543">sink</text>
diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg
index 57c2e7f4..eee7a86b 100644
--- a/docs/test_cases/t00044_class_mermaid.svg
+++ b/docs/test_cases/t00044_class_mermaid.svg
@@ -138,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L9">
+        <a transform="translate(153.74609375, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L9">
           <g title="signal_handler" id="classId-C_0001591729735727316875-0" class="node default clickable">
             <rect height="57" width="248.84375" y="-28.5" x="-124.421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="124.421875" x1="-124.421875" class="divider"/>
@@ -157,7 +157,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L9">
+        <a transform="translate(455.6953125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L9">
           <g title="sink" id="classId-C_0000559574389062594251-1" class="node default clickable">
             <rect height="123" width="299.546875" y="-61.5" x="-149.7734375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="149.7734375" x1="-149.7734375" class="divider"/>
@@ -191,7 +191,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4">
+        <a transform="translate(131.9609375, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4">
           <g title="signal_handler" id="classId-C_0000103559998624864011-2" class="node default clickable">
             <rect height="57" width="247.921875" y="-28.5" x="-123.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="123.9609375" x1="-123.9609375" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4">
+        <a transform="translate(293.828125, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001718007222067272862-3" class="node default clickable">
             <rect height="57" width="298.625" y="-28.5" x="-149.3125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="149.3125" x1="-149.3125" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L33">
+        <a transform="translate(293.828125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L33">
           <g title="R" id="classId-C_0001644484569399365272-4" class="node default clickable">
             <rect height="79" width="340.984375" y="-39.5" x="-170.4921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="170.4921875" x1="-170.4921875" class="divider"/>
@@ -253,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L6">
+        <a transform="translate(153.74609375, 588.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L6">
           <g title="signal_handler" id="classId-C_0000276594465967577895-5" class="node default clickable">
             <rect height="57" width="170.609375" y="-28.5" x="-85.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="85.3046875" x1="-85.3046875" class="divider"/>
@@ -272,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00044/t00044.cc#L4">
+        <a transform="translate(477.48046875, 481.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00044/t00044.cc#L4">
           <g title="sink" id="classId-C_0001759724482769288325-6" class="node default clickable">
             <rect height="57" width="75.484375" y="-28.5" x="-37.7421875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="37.7421875" x1="-37.7421875" class="divider"/>
diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md
index 4659275c..dad35251 100644
--- a/docs/test_cases/t00045.md
+++ b/docs/test_cases/t00045.md
@@ -419,6 +419,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -446,6 +447,7 @@ public:
             "line": 40,
             "translation_unit": "t00045.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index ddbba523..e606bd6a 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="f1bqrgrnoeccan" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f5chjgc8pokmx" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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>
@@ -43,110 +43,110 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="73.5" y2="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="81.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bqrgrnoeccan)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5chjgc8pokmx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L40" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L40" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="205" y="54.2104">foo(AA &amp; aa) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="196" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="36" x="205" y="75.0151">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <ellipse cx="196" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="92.4141"/>
       <ellipse cx="196" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="100.6245">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="105.2188"/>
       <ellipse cx="196" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="113.4292">root_a : ::A *</text>
     </a>
     <path d="M472.37,265.58 C471.86,279.36 471.31,294.06 470.87,305.83 " fill="none" id="C_0002207007194029669343&lt;-C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg
index a8f03121..a5c9d72a 100644
--- a/docs/test_cases/t00045_class_mermaid.svg
+++ b/docs/test_cases/t00045_class_mermaid.svg
@@ -166,7 +166,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L1">
+        <a transform="translate(728.5625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L1">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L3">
+        <a transform="translate(374.875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L3">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L5">
+        <a transform="translate(468.765625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L5">
           <g title="AAA" id="classId-C_0000054164402597771463-2" class="node default clickable">
             <rect height="57" width="49.671875" y="-28.5" x="-24.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L7">
+        <a transform="translate(52.84375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L7">
           <g title="AAAA" id="classId-C_0000375905626569465019-3" class="node default clickable">
             <rect height="79" width="89.6875" y="-39.5" x="-44.84375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="44.84375" x1="-44.84375" class="divider"/>
@@ -247,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L13">
+        <a transform="translate(575.9921875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L13">
           <g title="A" id="classId-C_0000619642232943663499-4" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -266,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L17">
+        <a transform="translate(246.2109375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L17">
           <g title="A" id="classId-C_0002207007194029669343-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -285,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L19">
+        <a transform="translate(169.703125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L19">
           <g title="B" id="classId-C_0000204051985124373077-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -304,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L21">
+        <a transform="translate(575.9921875, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L21">
           <g title="C" id="classId-C_0001837009554564742531-7" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L23">
+        <a transform="translate(338.64453125, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L23">
           <g title="D" id="classId-C_0002029929560931799980-8" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -342,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L25">
+        <a transform="translate(728.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L25">
           <g title="E" id="classId-C_0002305358535757579772-9" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -361,7 +361,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L27">
+        <a transform="translate(210.75, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L27">
           <g title="AAA" id="classId-C_0001731264248793686366-10" class="node default clickable">
             <rect height="57" width="126.125" y="-28.5" x="-63.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="63.0625" x1="-63.0625" class="divider"/>
@@ -380,7 +380,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00045/t00045.cc#L29">
+        <a transform="translate(421.8203125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00045/t00045.cc#L29">
           <g title="R" id="classId-C_0000974430595320588991-11" class="node default clickable">
             <rect height="167" width="196.015625" y="-83.5" x="-98.0078125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="98.0078125" x1="-98.0078125" class="divider"/>
diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md
index 46bccef1..afd585dd 100644
--- a/docs/test_cases/t00046.md
+++ b/docs/test_cases/t00046.md
@@ -109,7 +109,7 @@ public:
       "elements": [
         {
           "bases": [],
-          "display_name": "ns1::A",
+          "display_name": "A",
           "id": "619642232943663499",
           "is_abstract": false,
           "is_nested": false,
@@ -134,7 +134,7 @@ public:
           "elements": [
             {
               "bases": [],
-              "display_name": "ns1::ns2::A",
+              "display_name": "A",
               "id": "2207007194029669343",
               "is_abstract": false,
               "is_nested": false,
@@ -163,7 +163,7 @@ public:
                   "name": "ns1::ns2::A"
                 }
               ],
-              "display_name": "ns1::ns2::B",
+              "display_name": "B",
               "id": "204051985124373077",
               "is_abstract": false,
               "is_nested": false,
@@ -192,7 +192,7 @@ public:
                   "name": "ns1::A"
                 }
               ],
-              "display_name": "ns1::ns2::C",
+              "display_name": "C",
               "id": "1837009554564742531",
               "is_abstract": false,
               "is_nested": false,
@@ -221,7 +221,7 @@ public:
                   "name": "ns1::ns2::A"
                 }
               ],
-              "display_name": "ns1::ns2::D",
+              "display_name": "D",
               "id": "2029929560931799980",
               "is_abstract": false,
               "is_nested": false,
@@ -250,7 +250,7 @@ public:
                   "name": "A"
                 }
               ],
-              "display_name": "ns1::ns2::E",
+              "display_name": "E",
               "id": "2305358535757579772",
               "is_abstract": false,
               "is_nested": false,
@@ -272,7 +272,7 @@ public:
             },
             {
               "bases": [],
-              "display_name": "ns1::ns2::R",
+              "display_name": "R",
               "id": "974430595320588991",
               "is_abstract": false,
               "is_nested": false,
@@ -344,6 +344,7 @@ public:
               "methods": [
                 {
                   "access": "public",
+                  "display_name": "foo",
                   "is_const": false,
                   "is_consteval": false,
                   "is_constexpr": false,
@@ -371,6 +372,7 @@ public:
                     "line": 32,
                     "translation_unit": "t00046.cc"
                   },
+                  "template_parameters": [],
                   "type": "void"
                 }
               ],
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index d329cd89..e0bbe1c7 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="616px" preserveAspectRatio="none" style="width:586px;height:616px;" version="1.1" viewBox="0 0 586 616" width="586px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ff617q62zrh0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fw87t2hujrh56" 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,120 +9,120 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#ff617q62zrh0)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fw87t2hujrh56)" points="22,24,57,24,64,46.2969,436,46.2969,436,604,22,604,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#ff617q62zrh0)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fw87t2hujrh56)" points="46,170,81,170,88,192.2969,412,192.2969,412,580,46,580,46,170" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="88" y1="192.2969" y2="192.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="50" y="184.9951">ns2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="108" y="59"/>
       <ellipse cx="123" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M125.9688,80.6406 Q125.3906,80.9375 124.75,81.0781 Q124.1094,81.2344 123.4063,81.2344 Q120.9063,81.2344 119.5781,79.5938 Q118.2656,77.9375 118.2656,74.8125 Q118.2656,71.6875 119.5781,70.0313 Q120.9063,68.375 123.4063,68.375 Q124.1094,68.375 124.75,68.5313 Q125.4063,68.6875 125.9688,68.9844 L125.9688,71.7031 Q125.3438,71.125 124.75,70.8594 Q124.1563,70.5781 123.5313,70.5781 Q122.1875,70.5781 121.5,71.6563 Q120.8125,72.7188 120.8125,74.8125 Q120.8125,76.9063 121.5,77.9844 Q122.1875,79.0469 123.5313,79.0469 Q124.1563,79.0469 124.75,78.7813 Q125.3438,78.5 125.9688,77.9219 L125.9688,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="137" y="79.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="91" y2="91"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="109" x2="147" y1="99" y2="99"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="208" y="407"/>
       <ellipse cx="223" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M225.9688,428.6406 Q225.3906,428.9375 224.75,429.0781 Q224.1094,429.2344 223.4063,429.2344 Q220.9063,429.2344 219.5781,427.5938 Q218.2656,425.9375 218.2656,422.8125 Q218.2656,419.6875 219.5781,418.0313 Q220.9063,416.375 223.4063,416.375 Q224.1094,416.375 224.75,416.5313 Q225.4063,416.6875 225.9688,416.9844 L225.9688,419.7031 Q225.3438,419.125 224.75,418.8594 Q224.1563,418.5781 223.5313,418.5781 Q222.1875,418.5781 221.5,419.6563 Q220.8125,420.7188 220.8125,422.8125 Q220.8125,424.9063 221.5,425.9844 Q222.1875,427.0469 223.5313,427.0469 Q224.1563,427.0469 224.75,426.7813 Q225.3438,426.5 225.9688,425.9219 L225.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="237" y="427.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="439" y2="439"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209" x2="247" y1="447" y2="447"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="178" y="516"/>
       <ellipse cx="193" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.9688,537.6406 Q195.3906,537.9375 194.75,538.0781 Q194.1094,538.2344 193.4063,538.2344 Q190.9063,538.2344 189.5781,536.5938 Q188.2656,534.9375 188.2656,531.8125 Q188.2656,528.6875 189.5781,527.0313 Q190.9063,525.375 193.4063,525.375 Q194.1094,525.375 194.75,525.5313 Q195.4063,525.6875 195.9688,525.9844 L195.9688,528.7031 Q195.3438,528.125 194.75,527.8594 Q194.1563,527.5781 193.5313,527.5781 Q192.1875,527.5781 191.5,528.6563 Q190.8125,529.7188 190.8125,531.8125 Q190.8125,533.9063 191.5,534.9844 Q192.1875,536.0469 193.5313,536.0469 Q194.1563,536.0469 194.75,535.7813 Q195.3438,535.5 195.9688,534.9219 L195.9688,537.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="536.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="548" y2="548"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="217" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="62" y="243.5"/>
       <ellipse cx="77" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M79.9688,265.1406 Q79.3906,265.4375 78.75,265.5781 Q78.1094,265.7344 77.4063,265.7344 Q74.9063,265.7344 73.5781,264.0938 Q72.2656,262.4375 72.2656,259.3125 Q72.2656,256.1875 73.5781,254.5313 Q74.9063,252.875 77.4063,252.875 Q78.1094,252.875 78.75,253.0313 Q79.4063,253.1875 79.9688,253.4844 L79.9688,256.2031 Q79.3438,255.625 78.75,255.3594 Q78.1563,255.0781 77.5313,255.0781 Q76.1875,255.0781 75.5,256.1563 Q74.8125,257.2188 74.8125,259.3125 Q74.8125,261.4063 75.5,262.4844 Q76.1875,263.5469 77.5313,263.5469 Q78.1563,263.5469 78.75,263.2813 Q79.3438,263 79.9688,262.4219 L79.9688,265.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91" y="263.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="275.5" y2="275.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="63" x2="101" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="253.5" y="516"/>
       <ellipse cx="268.5" cy="532" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M271.4688,537.6406 Q270.8906,537.9375 270.25,538.0781 Q269.6094,538.2344 268.9063,538.2344 Q266.4063,538.2344 265.0781,536.5938 Q263.7656,534.9375 263.7656,531.8125 Q263.7656,528.6875 265.0781,527.0313 Q266.4063,525.375 268.9063,525.375 Q269.6094,525.375 270.25,525.5313 Q270.9063,525.6875 271.4688,525.9844 L271.4688,528.7031 Q270.8438,528.125 270.25,527.8594 Q269.6563,527.5781 269.0313,527.5781 Q267.6875,527.5781 267,528.6563 Q266.3125,529.7188 266.3125,531.8125 Q266.3125,533.9063 267,534.9844 Q267.6875,536.0469 269.0313,536.0469 Q269.6563,536.0469 270.25,535.7813 Q270.8438,535.5 271.4688,534.9219 L271.4688,537.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="282.5" y="536.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="548" y2="548"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254.5" x2="293.5" y1="556" y2="556"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="356" y="243.5"/>
       <ellipse cx="371" cy="259.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M373.9688,265.1406 Q373.3906,265.4375 372.75,265.5781 Q372.1094,265.7344 371.4063,265.7344 Q368.9063,265.7344 367.5781,264.0938 Q366.2656,262.4375 366.2656,259.3125 Q366.2656,256.1875 367.5781,254.5313 Q368.9063,252.875 371.4063,252.875 Q372.1094,252.875 372.75,253.0313 Q373.4063,253.1875 373.9688,253.4844 L373.9688,256.2031 Q373.3438,255.625 372.75,255.3594 Q372.1563,255.0781 371.5313,255.0781 Q370.1875,255.0781 369.5,256.1563 Q368.8125,257.2188 368.8125,259.3125 Q368.8125,261.4063 369.5,262.4844 Q370.1875,263.5469 371.5313,263.5469 Q372.1563,263.5469 372.75,263.2813 Q373.3438,263 373.9688,262.4219 L373.9688,265.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="385" y="263.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="275.5" y2="275.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="357" x2="395" y1="283.5" y2="283.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="137" y="205"/>
       <ellipse cx="220.75" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.7188,226.6406 Q223.1406,226.9375 222.5,227.0781 Q221.8594,227.2344 221.1563,227.2344 Q218.6563,227.2344 217.3281,225.5938 Q216.0156,223.9375 216.0156,220.8125 Q216.0156,217.6875 217.3281,216.0313 Q218.6563,214.375 221.1563,214.375 Q221.8594,214.375 222.5,214.5313 Q223.1563,214.6875 223.7188,214.9844 L223.7188,217.7031 Q223.0938,217.125 222.5,216.8594 Q221.9063,216.5781 221.2813,216.5781 Q219.9375,216.5781 219.25,217.6563 Q218.5625,218.7188 218.5625,220.8125 Q218.5625,222.9063 219.25,223.9844 Q219.9375,225.0469 221.2813,225.0469 Q221.9063,225.0469 222.5,224.7813 Q223.0938,224.5 223.7188,223.9219 L223.7188,226.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="241.25" y="225.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="243"/>
       <ellipse cx="148" cy="248" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L32" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="157" y="251.2104">foo(AA &amp; aa) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="320" y1="257.8047" y2="257.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="143" y="263.8047"/>
       <ellipse cx="148" cy="268.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="36" x="157" y="272.0151">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="143" y="276.6094"/>
       <ellipse cx="148" cy="281.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="157" y="284.8198">i : std::vector&lt;std::uint8_t&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="143" y="289.4141"/>
       <ellipse cx="148" cy="294.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="157" y="297.6245">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="143" y="302.2188"/>
       <ellipse cx="148" cy="307.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="157" y="310.4292">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="143" y="315.0234"/>
       <ellipse cx="148" cy="320.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="157" y="323.2339">root_a : ::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="535" y="407"/>
       <ellipse cx="550" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M552.9688,428.6406 Q552.3906,428.9375 551.75,429.0781 Q551.1094,429.2344 550.4063,429.2344 Q547.9063,429.2344 546.5781,427.5938 Q545.2656,425.9375 545.2656,422.8125 Q545.2656,419.6875 546.5781,418.0313 Q547.9063,416.375 550.4063,416.375 Q551.1094,416.375 551.75,416.5313 Q552.4063,416.6875 552.9688,416.9844 L552.9688,419.7031 Q552.3438,419.125 551.75,418.8594 Q551.1563,418.5781 550.5313,418.5781 Q549.1875,418.5781 548.5,419.6563 Q547.8125,420.7188 547.8125,422.8125 Q547.8125,424.9063 548.5,425.9844 Q549.1875,427.0469 550.5313,427.0469 Q551.1563,427.0469 551.75,426.7813 Q552.3438,426.5 552.9688,425.9219 L552.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="564" y="427.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="439" y2="439"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="536" x2="574" y1="447" y2="447"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ff617q62zrh0)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw87t2hujrh56)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="452" y="407"/>
       <ellipse cx="467" cy="423" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.9688,428.6406 Q469.3906,428.9375 468.75,429.0781 Q468.1094,429.2344 467.4063,429.2344 Q464.9063,429.2344 463.5781,427.5938 Q462.2656,425.9375 462.2656,422.8125 Q462.2656,419.6875 463.5781,418.0313 Q464.9063,416.375 467.4063,416.375 Q468.1094,416.375 468.75,416.5313 Q469.4063,416.6875 469.9688,416.9844 L469.9688,419.7031 Q469.3438,419.125 468.75,418.8594 Q468.1563,418.5781 467.5313,418.5781 Q466.1875,418.5781 465.5,419.6563 Q464.8125,420.7188 464.8125,422.8125 Q464.8125,424.9063 465.5,425.9844 Q466.1875,427.0469 467.5313,427.0469 Q468.1563,427.0469 468.75,426.7813 Q469.3438,426.5 469.9688,425.9219 L469.9688,428.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="481" y="427.1543">AA</text>
diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg
index 812c9a6a..ada25902 100644
--- a/docs/test_cases/t00046_class_mermaid.svg
+++ b/docs/test_cases/t00046_class_mermaid.svg
@@ -154,7 +154,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L4">
+        <a transform="translate(552.60546875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L4">
           <g title="A" id="classId-C_0000864916647665253425-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L6">
+        <a transform="translate(298.58984375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L6">
           <g title="AA" id="classId-C_0000386872828559902182-1" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L10">
+        <a transform="translate(400.03515625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L10">
           <g title="A" id="classId-C_0000619642232943663499-2" class="node default clickable">
             <rect height="57" width="64.78125" y="-28.5" x="-32.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -211,7 +211,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L14">
+        <a transform="translate(136.015625, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L14">
           <g title="A" id="classId-C_0002207007194029669343-3" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -230,7 +230,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L16">
+        <a transform="translate(59.5078125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L16">
           <g title="B" id="classId-C_0000204051985124373077-4" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -249,7 +249,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L18">
+        <a transform="translate(400.03515625, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L18">
           <g title="C" id="classId-C_0001837009554564742531-5" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -268,7 +268,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L20">
+        <a transform="translate(212.5234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L20">
           <g title="D" id="classId-C_0002029929560931799980-6" class="node default clickable">
             <rect height="57" width="103.015625" y="-28.5" x="-51.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.5078125" x1="-51.5078125" class="divider"/>
@@ -287,7 +287,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L22">
+        <a transform="translate(552.60546875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L22">
           <g title="E" id="classId-C_0002305358535757579772-7" class="node default clickable">
             <rect height="57" width="102.125" y="-28.5" x="-51.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="51.0625" x1="-51.0625" class="divider"/>
@@ -306,7 +306,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00046/t00046.cc#L24">
+        <a transform="translate(298.58984375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00046/t00046.cc#L24">
           <g title="R" id="classId-C_0000974430595320588991-8" class="node default clickable">
             <rect height="189" width="212" y="-94.5" x="-106" class="outer title-state"/>
             <line y2="-64.5" y1="-64.5" x2="106" x1="-106" class="divider"/>
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index 0a473ae6..bb834e8b 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="f1p4kfanbjz0gl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fxqxqvrvzp2hd" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p4kfanbjz0gl)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxqxqvrvzp2hd)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" 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="80" x="35" y="136.1543">conditional_t</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p4kfanbjz0gl)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxqxqvrvzp2hd)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="116"/>
       <ellipse cx="197.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.4688,137.6406 Q199.8906,137.9375 199.25,138.0781 Q198.6094,138.2344 197.9063,138.2344 Q195.4063,138.2344 194.0781,136.5938 Q192.7656,134.9375 192.7656,131.8125 Q192.7656,128.6875 194.0781,127.0313 Q195.4063,125.375 197.9063,125.375 Q198.6094,125.375 199.25,125.5313 Q199.9063,125.6875 200.4688,125.9844 L200.4688,128.7031 Q199.8438,128.125 199.25,127.8594 Q198.6563,127.5781 198.0313,127.5781 Q196.6875,127.5781 196,128.6563 Q195.3125,129.7188 195.3125,131.8125 Q195.3125,133.9063 196,134.9844 Q196.6875,136.0469 198.0313,136.0469 Q198.6563,136.0469 199.25,135.7813 Q199.8438,135.5 200.4688,134.9219 L200.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="211.5" y="136.1543">conditional_t</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p4kfanbjz0gl)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxqxqvrvzp2hd)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="116"/>
       <ellipse cx="515" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M517.9688,137.6406 Q517.3906,137.9375 516.75,138.0781 Q516.1094,138.2344 515.4063,138.2344 Q512.9063,138.2344 511.5781,136.5938 Q510.2656,134.9375 510.2656,131.8125 Q510.2656,128.6875 511.5781,127.0313 Q512.9063,125.375 515.4063,125.375 Q516.1094,125.375 516.75,125.5313 Q517.4063,125.6875 517.9688,125.9844 L517.9688,128.7031 Q517.3438,128.125 516.75,127.8594 Q516.1563,127.5781 515.5313,127.5781 Q514.1875,127.5781 513.5,128.6563 Q512.8125,129.7188 512.8125,131.8125 Q512.8125,133.9063 513.5,134.9844 Q514.1875,136.0469 515.5313,136.0469 Q516.1563,136.0469 516.75,135.7813 Q517.3438,135.5 517.9688,134.9219 L517.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="529" y="136.1543">conditional_t</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p4kfanbjz0gl)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxqxqvrvzp2hd)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="8"/>
       <ellipse cx="268" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M270.9688,29.6406 Q270.3906,29.9375 269.75,30.0781 Q269.1094,30.2344 268.4063,30.2344 Q265.9063,30.2344 264.5781,28.5938 Q263.2656,26.9375 263.2656,23.8125 Q263.2656,20.6875 264.5781,19.0313 Q265.9063,17.375 268.4063,17.375 Q269.1094,17.375 269.75,17.5313 Q270.4063,17.6875 270.9688,17.9844 L270.9688,20.7031 Q270.3438,20.125 269.75,19.8594 Q269.1563,19.5781 268.5313,19.5781 Q267.1875,19.5781 266.5,20.6563 Q265.8125,21.7188 265.8125,23.8125 Q265.8125,25.9063 266.5,26.9844 Q267.1875,28.0469 268.5313,28.0469 Q269.1563,28.0469 269.75,27.7813 Q270.3438,27.5 270.9688,26.9219 L270.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="282" y="28.1543">conditional_t</text>
diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg
index df6d1eee..01ad11cf 100644
--- a/docs/test_cases/t00047_class_mermaid.svg
+++ b/docs/test_cases/t00047_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L8">
+        <a transform="translate(91.078125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L8">
           <g title="conditional_t" id="classId-C_0000047394280824625133-0" class="node default clickable">
             <rect height="57" width="166.15625" y="-28.5" x="-83.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.078125" x1="-83.078125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L13">
+        <a transform="translate(392.8671875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L13">
           <g title="conditional_t" id="classId-C_0000599782159389775809-1" class="node default clickable">
             <rect height="57" width="337.421875" y="-28.5" x="-168.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="168.7109375" x1="-168.7109375" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L18">
+        <a transform="translate(783.4140625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L18">
           <g title="conditional_t" id="classId-C_0000824938194184364511-2" class="node default clickable">
             <rect height="57" width="343.671875" y="-28.5" x="-171.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="171.8359375" x1="-171.8359375" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00047/t00047.cc#L6">
+        <a transform="translate(392.8671875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00047/t00047.cc#L6">
           <g title="conditional_t" id="classId-C_0001673692992642087414-3" class="node default clickable">
             <rect height="57" width="164.0625" y="-28.5" x="-82.03125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="82.03125" x1="-82.03125" class="divider"/>
diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md
index 53abd167..dda45eb2 100644
--- a/docs/test_cases/t00048.md
+++ b/docs/test_cases/t00048.md
@@ -152,6 +152,7 @@ template <typename T> struct BaseTemplate {
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -174,6 +175,7 @@ template <typename T> struct BaseTemplate {
             "line": 9,
             "translation_unit": "b_t00048.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -214,6 +216,7 @@ template <typename T> struct BaseTemplate {
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -236,6 +239,7 @@ template <typename T> struct BaseTemplate {
             "line": 15,
             "translation_unit": "b_t00048.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -290,6 +294,7 @@ template <typename T> struct BaseTemplate {
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -312,6 +317,7 @@ template <typename T> struct BaseTemplate {
             "line": 11,
             "translation_unit": "b_t00048.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -359,6 +365,7 @@ template <typename T> struct BaseTemplate {
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -381,6 +388,7 @@ template <typename T> struct BaseTemplate {
             "line": 17,
             "translation_unit": "b_t00048.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -435,6 +443,7 @@ template <typename T> struct BaseTemplate {
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -457,6 +466,7 @@ template <typename T> struct BaseTemplate {
             "line": 11,
             "translation_unit": "a_t00048.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -504,6 +514,7 @@ template <typename T> struct BaseTemplate {
       "methods": [
         {
           "access": "public",
+          "display_name": "foo",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -526,6 +537,7 @@ template <typename T> struct BaseTemplate {
             "line": 17,
             "translation_unit": "a_t00048.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index d334e58a..74a92b6b 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="fghw75y82ifpl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgvls4d1zlpj9" 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,30 +9,30 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fghw75y82ifpl)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvls4d1zlpj9)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L9" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L9" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="54.2104">foo() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="92.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">base : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fghw75y82ifpl)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvls4d1zlpj9)" 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>
@@ -40,45 +40,45 @@
       <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L15" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L15" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="54.2104">foo() = 0 : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="295" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">base : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fghw75y82ifpl)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvls4d1zlpj9)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="200.8047"/>
       <ellipse cx="17" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="209.0151">b : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fghw75y82ifpl)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvls4d1zlpj9)" 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>
@@ -86,45 +86,45 @@
       <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="200.8047"/>
       <ellipse cx="273" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="209.0151">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fghw75y82ifpl)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvls4d1zlpj9)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L11" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="200.8047"/>
       <ellipse cx="139" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="209.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fghw75y82ifpl)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgvls4d1zlpj9)" 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>
@@ -132,19 +132,19 @@
       <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L17" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L17" xlink:show="new" xlink:title="foo" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="426" y="188.2104">foo() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="200.8047"/>
       <ellipse cx="417" cy="205.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="209.0151">a : T</text>
     </a>
     <path d="M102.14,99.04 C92.53,113.46 82.34,128.74 73.52,141.97 " fill="none" id="C_0000010200626899013233&lt;-C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg
index 381c7a8e..7df3c1f1 100644
--- a/docs/test_cases/t00048_class_mermaid.svg
+++ b/docs/test_cases/t00048_class_mermaid.svg
@@ -94,7 +94,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L6">
+        <a transform="translate(132.9375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L6">
           <g title="Base" id="classId-C_0000010200626899013233-0" class="node default clickable">
             <rect height="123" width="99.9375" y="-61.5" x="-49.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -123,7 +123,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/t00048.h#L12">
+        <a transform="translate(456.65625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/t00048.h#L12">
           <g title="BaseTemplate" id="classId-C_0000630197772543569536-1" class="node default clickable">
             <rect height="123" width="150.765625" y="-61.5" x="-75.3828125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="75.3828125" x1="-75.3828125" class="divider"/>
@@ -152,7 +152,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L8">
+        <a transform="translate(57.96875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L8">
           <g title="B" id="classId-C_0000059336049758992190-2" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -181,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/b_t00048.h#L14">
+        <a transform="translate(369.9140625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/b_t00048.h#L14">
           <g title="BTemplate" id="classId-C_0001635850649347735305-3" class="node default clickable">
             <rect height="101" width="124.078125" y="-50.5" x="-62.0390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="62.0390625" x1="-62.0390625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L8">
+        <a transform="translate(207.90625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L8">
           <g title="A" id="classId-C_0000199333691834211223-4" class="node default clickable">
             <rect height="101" width="99.9375" y="-50.5" x="-49.96875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -239,7 +239,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00048/a_t00048.h#L14">
+        <a transform="translate(543.3984375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00048/a_t00048.h#L14">
           <g title="ATemplate" id="classId-C_0001025697108404463905-5" class="node default clickable">
             <rect height="101" width="122.890625" y="-50.5" x="-61.4453125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="61.4453125" x1="-61.4453125" class="divider"/>
diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md
index e076aaab..39fd3a6c 100644
--- a/docs/test_cases/t00049.md
+++ b/docs/test_cases/t00049.md
@@ -79,6 +79,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "get_a",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -101,6 +102,7 @@ struct R {
             "line": 10,
             "translation_unit": "t00049.cc"
           },
+          "template_parameters": [],
           "type": "T &"
         }
       ],
@@ -229,7 +231,7 @@ struct R {
             "line": 14,
             "translation_unit": "t00049.cc"
           },
-          "type": "A<std::basic_string<char>>"
+          "type": "A<thestring>"
         },
         {
           "access": "public",
@@ -241,7 +243,7 @@ struct R {
             "line": 15,
             "translation_unit": "t00049.cc"
           },
-          "type": "A<std::vector<std::string>>"
+          "type": "A<string_vector>"
         },
         {
           "access": "public",
@@ -253,12 +255,13 @@ struct R {
             "line": 16,
             "translation_unit": "t00049.cc"
           },
-          "type": "A<std::map<int,int>>"
+          "type": "A<intmap>"
         }
       ],
       "methods": [
         {
           "access": "public",
+          "display_name": "get_int_map",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -281,10 +284,12 @@ struct R {
             "line": 18,
             "translation_unit": "t00049.cc"
           },
-          "type": "clanguml::t00049::A<std::map<int,int>>"
+          "template_parameters": [],
+          "type": "clanguml::t00049::A<intmap>"
         },
         {
           "access": "public",
+          "display_name": "set_int_map",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -312,6 +317,7 @@ struct R {
             "line": 20,
             "translation_unit": "t00049.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index 73cf427c..3c2ea898 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:401px;height:390px;" version="1.1" viewBox="0 0 401 390" width="401px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flnow5vjhmwee" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fl1q76g0apcfy" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flnow5vjhmwee)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1q76g0apcfy)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="129.5" y="306"/>
       <ellipse cx="165.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.6188,327.6406 Q168.0406,327.9375 167.4,328.0781 Q166.7594,328.2344 166.0563,328.2344 Q163.5563,328.2344 162.2281,326.5938 Q160.9156,324.9375 160.9156,321.8125 Q160.9156,318.6875 162.2281,317.0313 Q163.5563,315.375 166.0563,315.375 Q166.7594,315.375 167.4,315.5313 Q168.0563,315.6875 168.6188,315.9844 L168.6188,318.7031 Q167.9938,318.125 167.4,317.8594 Q166.8063,317.5781 166.1813,317.5781 Q164.8375,317.5781 164.15,318.6563 Q163.4625,319.7188 163.4625,321.8125 Q163.4625,323.9063 164.15,324.9844 Q164.8375,326.0469 166.1813,326.0469 Q166.8063,326.0469 167.4,325.7813 Q167.9938,325.5 168.6188,324.9219 L168.6188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="184.35" 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="7" x="222.5" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="135.5" y="344"/>
       <ellipse cx="140.5" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L10" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L10" xlink:show="new" xlink:title="get_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="149.5" y="352.2104">get_a() : T &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="130.5" x2="226.5" y1="358.8047" y2="358.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="135.5" y="364.8047"/>
       <ellipse cx="140.5" cy="369.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="149.5" y="373.0151">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flnow5vjhmwee)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1q76g0apcfy)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" 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>
@@ -43,8 +43,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flnow5vjhmwee)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1q76g0apcfy)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="128.5" y="197"/>
       <ellipse cx="143.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M146.4688,218.6406 Q145.8906,218.9375 145.25,219.0781 Q144.6094,219.2344 143.9063,219.2344 Q141.4063,219.2344 140.0781,217.5938 Q138.7656,215.9375 138.7656,212.8125 Q138.7656,209.6875 140.0781,208.0313 Q141.4063,206.375 143.9063,206.375 Q144.6094,206.375 145.25,206.5313 Q145.9063,206.6875 146.4688,206.9844 L146.4688,209.7031 Q145.8438,209.125 145.25,208.8594 Q144.6563,208.5781 144.0313,208.5781 Q142.6875,208.5781 142,209.6563 Q141.3125,210.7188 141.3125,212.8125 Q141.3125,214.9063 142,215.9844 Q142.6875,217.0469 144.0313,217.0469 Q144.6563,217.0469 145.25,216.7813 Q145.8438,216.5 146.4688,215.9219 L146.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.5" y="217.1543">A</text>
@@ -53,8 +53,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="227.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flnow5vjhmwee)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1q76g0apcfy)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="263.5" y="197"/>
       <ellipse cx="278.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M281.4688,218.6406 Q280.8906,218.9375 280.25,219.0781 Q279.6094,219.2344 278.9063,219.2344 Q276.4063,219.2344 275.0781,217.5938 Q273.7656,215.9375 273.7656,212.8125 Q273.7656,209.6875 275.0781,208.0313 Q276.4063,206.375 278.9063,206.375 Q279.6094,206.375 280.25,206.5313 Q280.9063,206.6875 281.4688,206.9844 L281.4688,209.7031 Q280.8438,209.125 280.25,208.8594 Q279.6563,208.5781 279.0313,208.5781 Q277.6875,208.5781 277,209.6563 Q276.3125,210.7188 276.3125,212.8125 Q276.3125,214.9063 277,215.9844 Q277.6875,217.0469 279.0313,217.0469 Q279.6563,217.0469 280.25,216.7813 Q280.8438,216.5 281.4688,215.9219 L281.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="292.5" y="217.1543">A</text>
@@ -63,47 +63,47 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="264.5" x2="386.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flnow5vjhmwee)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl1q76g0apcfy)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="41" y="8"/>
       <ellipse cx="170.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.2188,29.6406 Q172.6406,29.9375 172,30.0781 Q171.3594,30.2344 170.6563,30.2344 Q168.1563,30.2344 166.8281,28.5938 Q165.5156,26.9375 165.5156,23.8125 Q165.5156,20.6875 166.8281,19.0313 Q168.1563,17.375 170.6563,17.375 Q171.3594,17.375 172,17.5313 Q172.6563,17.6875 173.2188,17.9844 L173.2188,20.7031 Q172.5938,20.125 172,19.8594 Q171.4063,19.5781 170.7813,19.5781 Q169.4375,19.5781 168.75,20.6563 Q168.0625,21.7188 168.0625,23.8125 Q168.0625,25.9063 168.75,26.9844 Q169.4375,28.0469 170.7813,28.0469 Q171.4063,28.0469 172,27.7813 Q172.5938,27.5 173.2188,26.9219 L173.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="46"/>
       <ellipse cx="52" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L18" target="_top" title="get_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L18" xlink:show="new" xlink:title="get_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="61" y="54.2104">get_int_map() : A&lt;intmap&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="47" y="58.8047"/>
       <ellipse cx="52" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L20" target="_top" title="set_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L20" xlink:show="new" xlink:title="set_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="61" y="67.0151">set_int_map(A&lt;intmap&gt; &amp;&amp; int_map) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="42" x2="315" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="47" y="79.6094"/>
       <ellipse cx="52" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="61" y="87.8198">a_int_map : A&lt;intmap&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="47" y="92.4141"/>
       <ellipse cx="52" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="61" y="100.6245">a_string : A&lt;thestring&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="47" y="105.2188"/>
       <ellipse cx="52" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="61" y="113.4292">a_vector_string : A&lt;string_vector&gt;</text>
     </a>
     <path d="M74.37,245.14 C88.77,258.53 107.47,275.93 125.05,292.27 " fill="none" id="C_0000654829353386288443-&gt;C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg
index 7d27ebf4..bca14350 100644
--- a/docs/test_cases/t00049_class_mermaid.svg
+++ b/docs/test_cases/t00049_class_mermaid.svg
@@ -126,7 +126,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000372971769516871577-0" class="node default clickable">
             <rect height="101" width="112.6875" y="-50.5" x="-56.34375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="56.34375" x1="-56.34375" class="divider"/>
@@ -155,7 +155,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7">
+        <a transform="translate(56.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000654829353386288443-1" class="node default clickable">
             <rect height="57" width="97.6875" y="-28.5" x="-48.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="48.84375" x1="-48.84375" class="divider"/>
@@ -174,7 +174,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7">
+        <a transform="translate(212.53125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000973058255816844469-2" class="node default clickable">
             <rect height="57" width="113.6875" y="-28.5" x="-56.84375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="56.84375" x1="-56.84375" class="divider"/>
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L7">
+        <a transform="translate(392.6796875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L7">
           <g title="A" id="classId-C_0000562074851310302010-3" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -212,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00049/t00049.cc#L13">
+        <a transform="translate(212.53125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00049/t00049.cc#L13">
           <g title="R" id="classId-C_0002288024073053091226-4" class="node default clickable">
             <rect height="167" width="267.140625" y="-83.5" x="-133.5703125" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="133.5703125" x1="-133.5703125" class="divider"/>
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index cf46947d..7c318334 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="f1qk3e49t3qzn8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kagc2ehz42vc" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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>
@@ -62,43 +62,43 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="396" y2="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="402"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="404"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="410.2104">t : T[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="414.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="416.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="423.0151">v : V</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qk3e49t3qzn8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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(#f1qk3e49t3qzn8)" 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(#f1kagc2ehz42vc)" 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/t00050_class_mermaid.svg b/docs/test_cases/t00050_class_mermaid.svg
index 7e726b4f..80a97e83 100644
--- a/docs/test_cases/t00050_class_mermaid.svg
+++ b/docs/test_cases/t00050_class_mermaid.svg
@@ -184,7 +184,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L9">
+        <a transform="translate(532.8125, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L9">
           <g title="A" id="classId-C_0001885563213397742674-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -203,7 +203,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L24">
+        <a transform="translate(3122.31640625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L24">
           <g title="Lorem ipsum" id="classId-C_0000500262098409836244-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -222,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L53">
+        <a transform="translate(1277.3671875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L53">
           <g title="Long comment example" id="classId-C_0001663081653671078922-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -241,7 +241,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L65">
+        <a transform="translate(3731.265625, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L65">
           <g title="D" id="classId-C_0001492514566602019299-3" class="node default clickable">
             <rect height="57" width="70.109375" y="-28.5" x="-35.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="35.0546875" x1="-35.0546875" class="divider"/>
@@ -260,7 +260,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L70">
+        <a transform="translate(68.875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L70">
           <g title="E" id="classId-C_0002027344031570117998-4" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -294,7 +294,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L81">
+        <a transform="translate(3955.734375, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L81">
           <g title="Simple array wrapper." id="classId-C_0000793698410848959592-5" class="node default clickable">
             <rect height="101" width="105.109375" y="-50.5" x="-52.5546875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="52.5546875" x1="-52.5546875" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L91">
+        <a transform="translate(2130.421875, 573.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L91">
           <g title="G" id="classId-C_0000449485154531299941-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -342,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00050/t00050.cc#L93">
+        <a transform="translate(234.8046875, 240.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00050/t00050.cc#L93">
           <g title="NoComment" id="classId-C_0001832693799357996932-7" class="node default clickable">
             <rect height="57" width="110.109375" y="-28.5" x="-55.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md
index 1f8cfe80..517e4ad2 100644
--- a/docs/test_cases/t00051.md
+++ b/docs/test_cases/t00051.md
@@ -133,6 +133,7 @@ A::custom_thread2 A::start_thread2()
       "methods": [
         {
           "access": "public",
+          "display_name": "B",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -164,10 +165,12 @@ A::custom_thread2 A::start_thread2()
             "line": 7,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "f",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -190,10 +193,12 @@ A::custom_thread2 A::start_thread2()
             "line": 13,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "ff",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -216,6 +221,7 @@ A::custom_thread2 A::start_thread2()
             "line": 14,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -289,6 +295,7 @@ A::custom_thread2 A::start_thread2()
       "methods": [
         {
           "access": "public",
+          "display_name": "B",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -320,10 +327,12 @@ A::custom_thread2 A::start_thread2()
             "line": 7,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "f",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -346,10 +355,12 @@ A::custom_thread2 A::start_thread2()
             "line": 13,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "ff",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -372,6 +383,7 @@ A::custom_thread2 A::start_thread2()
             "line": 14,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -412,6 +424,7 @@ A::custom_thread2 A::start_thread2()
       "methods": [
         {
           "access": "private",
+          "display_name": "start_thread1",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -434,10 +447,12 @@ A::custom_thread2 A::start_thread2()
             "line": 33,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "custom_thread1"
         },
         {
           "access": "private",
+          "display_name": "start_thread2",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -460,10 +475,12 @@ A::custom_thread2 A::start_thread2()
             "line": 39,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "custom_thread2"
         },
         {
           "access": "private",
+          "display_name": "start_thread3",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -486,10 +503,12 @@ A::custom_thread2 A::start_thread2()
             "line": 41,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "clanguml::t00051::B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>"
         },
         {
           "access": "private",
+          "display_name": "get_function",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -512,6 +531,7 @@ A::custom_thread2 A::start_thread2()
             "line": 46,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "(lambda at t00051.cc:48:16)"
         }
       ],
@@ -546,6 +566,7 @@ A::custom_thread2 A::start_thread2()
       "methods": [
         {
           "access": "public",
+          "display_name": "custom_thread1<Function,Args...>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -571,6 +592,20 @@ A::custom_thread2 A::start_thread2()
               "type": "Args &&..."
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "Function",
+              "template_parameters": []
+            },
+            {
+              "is_variadic": true,
+              "kind": "template_type",
+              "name": "Args...",
+              "template_parameters": []
+            }
+          ],
           "type": "void"
         }
       ],
@@ -605,6 +640,7 @@ A::custom_thread2 A::start_thread2()
       "methods": [
         {
           "access": "public",
+          "display_name": "thread",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -632,6 +668,7 @@ A::custom_thread2 A::start_thread2()
             "line": 36,
             "translation_unit": "t00051.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
index da7b5aa1..847486ea 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="599px" preserveAspectRatio="none" style="width:789px;height:599px;" version="1.1" viewBox="0 0 789 599" width="789px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lmxtqaiouk2e" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flvmqsu81s3nq" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lmxtqaiouk2e)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="346" y="468"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flvmqsu81s3nq)" height="120.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="346" y="468"/>
       <ellipse cx="400.25" cy="484" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M403.2188,489.6406 Q402.6406,489.9375 402,490.0781 Q401.3594,490.2344 400.6563,490.2344 Q398.1563,490.2344 396.8281,488.5938 Q395.5156,486.9375 395.5156,483.8125 Q395.5156,480.6875 396.8281,479.0313 Q398.1563,477.375 400.6563,477.375 Q401.3594,477.375 402,477.5313 Q402.6563,477.6875 403.2188,477.9844 L403.2188,480.7031 Q402.5938,480.125 402,479.8594 Q401.4063,479.5781 400.7813,479.5781 Q399.4375,479.5781 398.75,480.6563 Q398.0625,481.7188 398.0625,483.8125 Q398.0625,485.9063 398.75,486.9844 Q399.4375,488.0469 400.7813,488.0469 Q401.4063,488.0469 402,487.7813 Q402.5938,487.5 403.2188,486.9219 L403.2188,489.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="420.75" y="488.1543">B</text>
@@ -18,45 +18,45 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="477" y="477.1387">F,FF=F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="500" y2="500"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="506"/>
       <ellipse cx="357" cy="511" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="366" y="514.2104">B(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="347" x2="516" y1="520.8047" y2="520.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="526.8047"/>
       <ellipse cx="357" cy="531.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="366" y="535.0151">f() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="352" y="539.6094"/>
       <ellipse cx="357" cy="544.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="366" y="547.8198">ff() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="347" x2="516" y1="554.4141" y2="554.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="352" y="560.4141"/>
       <ellipse cx="357" cy="565.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="366" y="568.6245">f_ : F</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="352" y="573.2188"/>
       <ellipse cx="357" cy="578.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="366" y="581.4292">ff_ : FF</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lmxtqaiouk2e)" height="120.0234" id="C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flvmqsu81s3nq)" height="120.0234" id="C_0001969502737237579476" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="288"/>
       <ellipse cx="239.25" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M242.2188,309.6406 Q241.6406,309.9375 241,310.0781 Q240.3594,310.2344 239.6563,310.2344 Q237.1563,310.2344 235.8281,308.5938 Q234.5156,306.9375 234.5156,303.8125 Q234.5156,300.6875 235.8281,299.0313 Q237.1563,297.375 239.6563,297.375 Q240.3594,297.375 241,297.5313 Q241.6563,297.6875 242.2188,297.9844 L242.2188,300.7031 Q241.5938,300.125 241,299.8594 Q240.4063,299.5781 239.7813,299.5781 Q238.4375,299.5781 237.75,300.6563 Q237.0625,301.7188 237.0625,303.8125 Q237.0625,305.9063 237.75,306.9844 Q238.4375,308.0469 239.7813,308.0469 Q240.4063,308.0469 241,307.7813 Q241.5938,307.5 242.2188,306.9219 L242.2188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="259.75" y="308.1543">B</text>
@@ -64,81 +64,81 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="364" x="306" y="297.1387">(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="320" y2="320"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="326"/>
       <ellipse cx="206" cy="331" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="334.2104">B((lambda at t00051.cc:43:18) &amp;&amp; f, (lambda at t00051.cc:43:27) &amp;&amp; ff) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="196" x2="667" y1="340.8047" y2="340.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="346.8047"/>
       <ellipse cx="206" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L13" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="215" y="355.0151">f() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="359.6094"/>
       <ellipse cx="206" cy="364.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" target="_top" title="ff" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L14" xlink:show="new" xlink:title="ff" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="215" y="367.8198">ff() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="374.4141" y2="374.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="201" y="380.4141"/>
       <ellipse cx="206" cy="385.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="182" x="215" y="388.6245">f_ : (lambda at t00051.cc:43:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="201" y="393.2188"/>
       <ellipse cx="206" cy="398.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="186" x="215" y="401.4292">ff_ : (lambda at t00051.cc:43:27)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lmxtqaiouk2e)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flvmqsu81s3nq)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="473" x="195" y="129"/>
       <ellipse cx="423.25" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M426.2188,150.6406 Q425.6406,150.9375 425,151.0781 Q424.3594,151.2344 423.6563,151.2344 Q421.1563,151.2344 419.8281,149.5938 Q418.5156,147.9375 418.5156,144.8125 Q418.5156,141.6875 419.8281,140.0313 Q421.1563,138.375 423.6563,138.375 Q424.3594,138.375 425,138.5313 Q425.6563,138.6875 426.2188,138.9844 L426.2188,141.7031 Q425.5938,141.125 425,140.8594 Q424.4063,140.5781 423.7813,140.5781 Q422.4375,140.5781 421.75,141.6563 Q421.0625,142.7188 421.0625,144.8125 Q421.0625,146.9063 421.75,147.9844 Q422.4375,149.0469 423.7813,149.0469 Q424.4063,149.0469 425,148.7813 Q425.5938,148.5 426.2188,147.9219 L426.2188,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="443.75" y="149.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="167"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L46" target="_top" title="get_function" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L46" xlink:show="new" xlink:title="get_function" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="249" x="215" y="175.2104">get_function() : (lambda at t00051.cc:48:16)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="179.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="181.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L33" target="_top" title="start_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L33" xlink:show="new" xlink:title="start_thread1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="188.0151">start_thread1() : custom_thread1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="192.6094"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="194.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L39" target="_top" title="start_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L39" xlink:show="new" xlink:title="start_thread2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="189" x="215" y="200.8198">start_thread2() : custom_thread2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="201" y="205.4141"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="203" y="207.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L41" target="_top" title="start_thread3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L41" xlink:show="new" xlink:title="start_thread3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="447" x="215" y="213.6245">start_thread3() : B&lt;(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="667" y1="220.2188" y2="220.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lmxtqaiouk2e)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flvmqsu81s3nq)" 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>
@@ -147,18 +147,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="421" x="26" y="54.2104">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="452" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lmxtqaiouk2e)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="290" x="488.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flvmqsu81s3nq)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="290" x="488.5" y="8"/>
       <ellipse cx="570.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M573.2188,29.6406 Q572.6406,29.9375 572,30.0781 Q571.3594,30.2344 570.6563,30.2344 Q568.1563,30.2344 566.8281,28.5938 Q565.5156,26.9375 565.5156,23.8125 Q565.5156,20.6875 566.8281,19.0313 Q568.1563,17.375 570.6563,17.375 Q571.3594,17.375 572,17.5313 Q572.6563,17.6875 573.2188,17.9844 L573.2188,20.7031 Q572.5938,20.125 572,19.8594 Q571.4063,19.5781 570.7813,19.5781 Q569.4375,19.5781 568.75,20.6563 Q568.0625,21.7188 568.0625,23.8125 Q568.0625,25.9063 568.75,26.9844 Q569.4375,28.0469 570.7813,28.0469 Q571.4063,28.0469 572,27.7813 Q572.5938,27.5 573.2188,26.9219 L573.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="590.75" y="28.1543">A::custom_thread2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="494.5" y="46"/>
       <ellipse cx="499.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L36" target="_top" title="thread" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L36" xlink:show="new" xlink:title="thread" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="264" x="508.5" y="54.2104">thread((lambda at t00051.cc:59:27) &amp;&amp;) : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="489.5" x2="777.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00051_class_mermaid.svg b/docs/test_cases/t00051_class_mermaid.svg
index d534a2ac..c6a978e3 100644
--- a/docs/test_cases/t00051_class_mermaid.svg
+++ b/docs/test_cases/t00051_class_mermaid.svg
@@ -102,7 +102,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(292.6171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L6">
+        <a transform="translate(292.6171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0000486675674447050206-0" class="node default clickable">
             <rect height="167" width="200.09375" y="-83.5" x="-100.046875" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="100.046875" x1="-100.046875" class="divider"/>
@@ -146,7 +146,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(292.6171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L6">
+        <a transform="translate(292.6171875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L6">
           <g title="B" id="classId-C_0001969502737237579476-1" class="node default clickable">
             <rect height="167" width="569.234375" y="-83.5" x="-284.6171875" class="outer title-state"/>
             <line y2="-53.5" y1="-53.5" x2="284.6171875" x1="-284.6171875" class="divider"/>
@@ -190,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(829.2734375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L20">
+        <a transform="translate(829.2734375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L20">
           <g title="A" id="classId-C_0001064663612772326174-2" class="node default clickable">
             <rect height="145" width="570.875" y="-72.5" x="-285.4375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="285.4375" x1="-285.4375" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(829.2734375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L23">
+        <a transform="translate(829.2734375, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L23">
           <g title="A##custom_thread1" id="classId-C_0000267762118222214764-3" class="node default clickable">
             <rect height="79" width="404.078125" y="-39.5" x="-202.0390625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="202.0390625" x1="-202.0390625" class="divider"/>
@@ -253,7 +253,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1259.796875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00051/t00051.cc#L35">
+        <a transform="translate(1259.796875, 286.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00051/t00051.cc#L35">
           <g title="A##custom_thread2" id="classId-C_0000728501319748477470-4" class="node default clickable">
             <rect height="79" width="356.96875" y="-39.5" x="-178.484375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="178.484375" x1="-178.484375" class="divider"/>
diff --git a/docs/test_cases/t00052.md b/docs/test_cases/t00052.md
index 8e841b26..9531cbd7 100644
--- a/docs/test_cases/t00052.md
+++ b/docs/test_cases/t00052.md
@@ -72,6 +72,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "a<T>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -93,10 +94,19 @@ struct R {
               "type": "T"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "T",
+              "template_parameters": []
+            }
+          ],
           "type": "T"
         },
         {
           "access": "public",
+          "display_name": "aa<F,Q>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -122,6 +132,20 @@ struct R {
               "type": "Q"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "F",
+              "template_parameters": []
+            },
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "Q",
+              "template_parameters": []
+            }
+          ],
           "type": "void"
         }
       ],
@@ -149,6 +173,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "b",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -176,10 +201,12 @@ struct R {
             "line": 15,
             "translation_unit": "t00052.cc"
           },
+          "template_parameters": [],
           "type": "T"
         },
         {
           "access": "public",
+          "display_name": "bb<F>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -205,6 +232,14 @@ struct R {
               "type": "T"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "F",
+              "template_parameters": []
+            }
+          ],
           "type": "T"
         }
       ],
@@ -239,6 +274,7 @@ struct R {
       "methods": [
         {
           "access": "private",
+          "display_name": "c<P>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -260,6 +296,14 @@ struct R {
               "type": "P"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "P",
+              "template_parameters": []
+            }
+          ],
           "type": "T"
         }
       ],
diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg
index fb9677a7..9691db45 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="f82gcm6e75ysf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fo0xceigi8s9x" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f82gcm6e75ysf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0xceigi8s9x)" 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 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="26" y="230.0151">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="191" y1="236.6094" y2="236.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f82gcm6e75ysf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0xceigi8s9x)" 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>
@@ -30,18 +30,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="303" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#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="162" y="344"/>
       <ellipse cx="167" cy="349" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="176" y="352.2104">b(T t) : T</text>
     </a>
     <ellipse cx="167" cy="361.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="365.0151">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="307" y1="371.6094" y2="371.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f82gcm6e75ysf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0xceigi8s9x)" 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>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="363" y="358.7104">c&lt;P&gt;(P p) : T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="344" x2="444" y1="365.3047" y2="365.3047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f82gcm6e75ysf)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0xceigi8s9x)" 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>
@@ -62,8 +62,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f82gcm6e75ysf)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0xceigi8s9x)" 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>
@@ -72,33 +72,33 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f82gcm6e75ysf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo0xceigi8s9x)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="225.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="225.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">b : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="79.6094"/>
       <ellipse cx="225.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="87.8198">c : C&lt;int&gt;</text>
     </a>
     <path d="M252.65,232.17 C249.84,247.09 246.07,267.16 242.51,286.07 " fill="none" id="C_0001043027222809675776-&gt;C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg
index a64eb1e5..8e80188d 100644
--- a/docs/test_cases/t00052_class_mermaid.svg
+++ b/docs/test_cases/t00052_class_mermaid.svg
@@ -114,7 +114,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L6">
+        <a transform="translate(95.3125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L6">
           <g title="A" id="classId-C_0002200853067459698271-0" class="node default clickable">
             <rect height="101" width="174.625" y="-50.5" x="-87.3125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="87.3125" x1="-87.3125" class="divider"/>
@@ -143,7 +143,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001737293776724790064-1" class="node default clickable">
             <rect height="101" width="147.046875" y="-50.5" x="-73.5234375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="73.5234375" x1="-73.5234375" class="divider"/>
@@ -172,7 +172,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000687756639884832524-2" class="node default clickable">
             <rect height="79" width="145.15625" y="-39.5" x="-72.578125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="72.578125" x1="-72.578125" class="divider"/>
@@ -196,7 +196,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L13">
+        <a transform="translate(265.0234375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L13">
           <g title="B" id="classId-C_0001043027222809675776-3" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -215,7 +215,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L20">
+        <a transform="translate(461.125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L20">
           <g title="C" id="classId-C_0000492968837554438176-4" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00052/t00052.cc#L29">
+        <a transform="translate(265.0234375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00052/t00052.cc#L29">
           <g title="R" id="classId-C_0001157978668683299226-5" class="node default clickable">
             <rect height="123" width="92.84375" y="-61.5" x="-46.421875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="46.421875" x1="-46.421875" class="divider"/>
diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg
index e6cf7309..8dd900c2 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="f13p1j8mzz1bsk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwtlq5tre04j6" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p1j8mzz1bsk)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwtlq5tre04j6)" 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/t00053_class_mermaid.svg b/docs/test_cases/t00053_class_mermaid.svg
index c53c09cd..250b7f96 100644
--- a/docs/test_cases/t00053_class_mermaid.svg
+++ b/docs/test_cases/t00053_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L4">
           <g title="b" id="classId-C_0001376344645244260547-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L6">
+        <a transform="translate(95.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L6">
           <g title="d" id="classId-C_0001264455164862224089-1" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L9">
+        <a transform="translate(169.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L9">
           <g title="g" id="classId-C_0000200227126708762001-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L12">
+        <a transform="translate(245.625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L12">
           <g title="B" id="classId-C_0000876623970071162908-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L14">
+        <a transform="translate(322.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L14">
           <g title="D" id="classId-C_0000470228045297785394-4" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L17">
+        <a transform="translate(399.1953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L17">
           <g title="G" id="classId-C_0001031614323468823578-5" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L20">
+        <a transform="translate(523.796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L20">
           <g title="i" id="classId-C_0001473214620883985930-6" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -190,7 +190,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L11">
+        <a transform="translate(647.953125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L11">
           <g title="A" id="classId-C_0000322642841130459425-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -209,7 +209,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L13">
+        <a transform="translate(724.515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L13">
           <g title="C" id="classId-C_0001248473990784124468-8" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -228,7 +228,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L15">
+        <a transform="translate(800.6328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L15">
           <g title="E" id="classId-C_0001038384764221361257-9" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -247,7 +247,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L16">
+        <a transform="translate(875.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L16">
           <g title="F" id="classId-C_0000530253748811039667-10" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -266,7 +266,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L3">
+        <a transform="translate(950.203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L3">
           <g title="a" id="classId-C_0000347629837292519144-11" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -285,7 +285,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L5">
+        <a transform="translate(1024.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L5">
           <g title="c" id="classId-C_0000504463801094568803-12" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -304,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L7">
+        <a transform="translate(1098.015625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L7">
           <g title="e" id="classId-C_0000907921963776939609-13" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -323,7 +323,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L8">
+        <a transform="translate(1170.1328125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L8">
           <g title="f" id="classId-C_0001421289128664274084-14" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -342,7 +342,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L19">
+        <a transform="translate(1291.171875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L19">
           <g title="h" id="classId-C_0000190978367074032185-15" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -366,7 +366,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00053/t00053.cc#L21">
+        <a transform="translate(1462.921875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00053/t00053.cc#L21">
           <g title="j" id="classId-C_0000965083605473661435-16" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md
index 735a6e90..c4ed53bf 100644
--- a/docs/test_cases/t00054.md
+++ b/docs/test_cases/t00054.md
@@ -119,7 +119,7 @@ enum class j { jjj };
       "elements": [
         {
           "bases": [],
-          "display_name": "detail::c",
+          "display_name": "c",
           "id": "1168031834662719964",
           "is_abstract": false,
           "is_nested": false,
@@ -141,7 +141,7 @@ enum class j { jjj };
         },
         {
           "bases": [],
-          "display_name": "detail::d",
+          "display_name": "d",
           "id": "1569559620782547158",
           "is_abstract": false,
           "is_nested": false,
@@ -163,7 +163,7 @@ enum class j { jjj };
         },
         {
           "bases": [],
-          "display_name": "detail::e",
+          "display_name": "e",
           "id": "2037550833462858827",
           "is_abstract": false,
           "is_nested": false,
@@ -280,7 +280,7 @@ enum class j { jjj };
       "elements": [
         {
           "bases": [],
-          "display_name": "detail2::C",
+          "display_name": "C",
           "id": "540054955081677892",
           "is_abstract": false,
           "is_nested": false,
@@ -305,7 +305,7 @@ enum class j { jjj };
           "elements": [
             {
               "bases": [],
-              "display_name": "detail2::detail3::D",
+              "display_name": "D",
               "id": "1266390196945323478",
               "is_abstract": false,
               "is_nested": false,
@@ -327,7 +327,7 @@ enum class j { jjj };
             },
             {
               "bases": [],
-              "display_name": "detail2::detail3::E",
+              "display_name": "E",
               "id": "134928214982255105",
               "is_abstract": false,
               "is_nested": false,
@@ -353,7 +353,7 @@ enum class j { jjj };
         },
         {
           "bases": [],
-          "display_name": "detail2::F",
+          "display_name": "F",
           "id": "446694692150903211",
           "is_abstract": false,
           "is_nested": false,
@@ -406,7 +406,7 @@ enum class j { jjj };
           "constants": [
             "hhh"
           ],
-          "display_name": "detail4::h",
+          "display_name": "h",
           "id": "1592677999268391183",
           "is_nested": false,
           "name": "h",
@@ -423,7 +423,7 @@ enum class j { jjj };
           "constants": [
             "iii"
           ],
-          "display_name": "detail4::i",
+          "display_name": "i",
           "id": "441521323390223397",
           "is_nested": false,
           "name": "i",
@@ -440,7 +440,7 @@ enum class j { jjj };
           "constants": [
             "jjj"
           ],
-          "display_name": "detail4::j",
+          "display_name": "j",
           "id": "499334434426587347",
           "is_nested": false,
           "name": "j",
diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg
index 4b138025..c95fff0c 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="flhpq64ku6cc5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ffdeu0a5xfkch" 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,28 +9,28 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#flhpq64ku6cc5)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#ffdeu0a5xfkch)" points="707,55,756,55,763,77.2969,1049,77.2969,1049,226,707,226,707,55" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="707" x2="763" y1="77.2969" y2="77.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="43" x="711" y="69.9951">detail</text>
-    <polygon fill="#FFFFFF" filter="url(#flhpq64ku6cc5)" 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(#ffdeu0a5xfkch)" 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(#flhpq64ku6cc5)" 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(#ffdeu0a5xfkch)" 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(#flhpq64ku6cc5)" 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(#ffdeu0a5xfkch)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" height="72" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="114"/>
       <ellipse cx="984" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M986.9688,135.6406 Q986.3906,135.9375 985.75,136.0781 Q985.1094,136.2344 984.4063,136.2344 Q981.9063,136.2344 980.5781,134.5938 Q979.2656,132.9375 979.2656,129.8125 Q979.2656,126.6875 980.5781,125.0313 Q981.9063,123.375 984.4063,123.375 Q985.1094,123.375 985.75,123.5313 Q986.4063,123.6875 986.9688,123.9844 L986.9688,126.7031 Q986.3438,126.125 985.75,125.8594 Q985.1563,125.5781 984.5313,125.5781 Q983.1875,125.5781 982.5,126.6563 Q981.8125,127.7188 981.8125,129.8125 Q981.8125,131.9063 982.5,132.9844 Q983.1875,134.0469 984.5313,134.0469 Q985.1563,134.0469 985.75,133.7813 Q986.3438,133.5 986.9688,132.9219 L986.9688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="998" y="134.1543">a</text>
@@ -40,8 +40,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" height="72" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="114"/>
       <ellipse cx="888.5" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M891.4688,135.6406 Q890.8906,135.9375 890.25,136.0781 Q889.6094,136.2344 888.9063,136.2344 Q886.4063,136.2344 885.0781,134.5938 Q883.7656,132.9375 883.7656,129.8125 Q883.7656,126.6875 885.0781,125.0313 Q886.4063,123.375 888.9063,123.375 Q889.6094,123.375 890.25,123.5313 Q890.9063,123.6875 891.4688,123.9844 L891.4688,126.7031 Q890.8438,126.125 890.25,125.8594 Q889.6563,125.5781 889.0313,125.5781 Q887.6875,125.5781 887,126.6563 Q886.3125,127.7188 886.3125,129.8125 Q886.3125,131.9063 887,132.9844 Q887.6875,134.0469 889.0313,134.0469 Q889.6563,134.0469 890.25,133.7813 Q890.8438,133.5 891.4688,132.9219 L891.4688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="902.5" y="134.1543">c</text>
@@ -51,8 +51,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" height="72" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="114"/>
       <ellipse cx="813" cy="130" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M815.9688,135.6406 Q815.3906,135.9375 814.75,136.0781 Q814.1094,136.2344 813.4063,136.2344 Q810.9063,136.2344 809.5781,134.5938 Q808.2656,132.9375 808.2656,129.8125 Q808.2656,126.6875 809.5781,125.0313 Q810.9063,123.375 813.4063,123.375 Q814.1094,123.375 814.75,123.5313 Q815.4063,123.6875 815.9688,123.9844 L815.9688,126.7031 Q815.3438,126.125 814.75,125.8594 Q814.1563,125.5781 813.5313,125.5781 Q812.1875,125.5781 811.5,126.6563 Q810.8125,127.7188 810.8125,129.8125 Q810.8125,131.9063 811.5,132.9844 Q812.1875,134.0469 813.5313,134.0469 Q814.1563,134.0469 814.75,133.7813 Q815.3438,133.5 815.9688,132.9219 L815.9688,135.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827" y="134.1543">e</text>
@@ -62,40 +62,40 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="170" y2="170"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" height="64" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="118"/>
       <ellipse cx="1466" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1468.9688,139.6406 Q1468.3906,139.9375 1467.75,140.0781 Q1467.1094,140.2344 1466.4063,140.2344 Q1463.9063,140.2344 1462.5781,138.5938 Q1461.2656,136.9375 1461.2656,133.8125 Q1461.2656,130.6875 1462.5781,129.0313 Q1463.9063,127.375 1466.4063,127.375 Q1467.1094,127.375 1467.75,127.5313 Q1468.4063,127.6875 1468.9688,127.9844 L1468.9688,130.7031 Q1468.3438,130.125 1467.75,129.8594 Q1467.1563,129.5781 1466.5313,129.5781 Q1465.1875,129.5781 1464.5,130.6563 Q1463.8125,131.7188 1463.8125,133.8125 Q1463.8125,135.9063 1464.5,136.9844 Q1465.1875,138.0469 1466.5313,138.0469 Q1467.1563,138.0469 1467.75,137.7813 Q1468.3438,137.5 1468.9688,136.9219 L1468.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1480" y="138.1543">A</text>
@@ -104,8 +104,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" height="64" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="118"/>
       <ellipse cx="1391" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1393.9688,139.6406 Q1393.3906,139.9375 1392.75,140.0781 Q1392.1094,140.2344 1391.4063,140.2344 Q1388.9063,140.2344 1387.5781,138.5938 Q1386.2656,136.9375 1386.2656,133.8125 Q1386.2656,130.6875 1387.5781,129.0313 Q1388.9063,127.375 1391.4063,127.375 Q1392.1094,127.375 1392.75,127.5313 Q1393.4063,127.6875 1393.9688,127.9844 L1393.9688,130.7031 Q1393.3438,130.125 1392.75,129.8594 Q1392.1563,129.5781 1391.5313,129.5781 Q1390.1875,129.5781 1389.5,130.6563 Q1388.8125,131.7188 1388.8125,133.8125 Q1388.8125,135.9063 1389.5,136.9844 Q1390.1875,138.0469 1391.5313,138.0469 Q1392.1563,138.0469 1392.75,137.7813 Q1393.3438,137.5 1393.9688,136.9219 L1393.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1405" y="138.1543">B</text>
@@ -114,8 +114,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" height="64" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="118"/>
       <ellipse cx="1299" cy="134" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1301.9688,139.6406 Q1301.3906,139.9375 1300.75,140.0781 Q1300.1094,140.2344 1299.4063,140.2344 Q1296.9063,140.2344 1295.5781,138.5938 Q1294.2656,136.9375 1294.2656,133.8125 Q1294.2656,130.6875 1295.5781,129.0313 Q1296.9063,127.375 1299.4063,127.375 Q1300.1094,127.375 1300.75,127.5313 Q1301.4063,127.6875 1301.9688,127.9844 L1301.9688,130.7031 Q1301.3438,130.125 1300.75,129.8594 Q1300.1563,129.5781 1299.5313,129.5781 Q1298.1875,129.5781 1297.5,130.6563 Q1296.8125,131.7188 1296.8125,133.8125 Q1296.8125,135.9063 1297.5,136.9844 Q1298.1875,138.0469 1299.5313,138.0469 Q1300.1563,138.0469 1300.75,137.7813 Q1301.3438,137.5 1301.9688,136.9219 L1301.9688,139.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="1313" y="138.1543">f</text>
@@ -124,8 +124,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="166" y2="166"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" height="56" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="122"/>
       <ellipse cx="310.5" cy="138" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M313.4688,143.6406 Q312.8906,143.9375 312.25,144.0781 Q311.6094,144.2344 310.9063,144.2344 Q308.4063,144.2344 307.0781,142.5938 Q305.7656,140.9375 305.7656,137.8125 Q305.7656,134.6875 307.0781,133.0313 Q308.4063,131.375 310.9063,131.375 Q311.6094,131.375 312.25,131.5313 Q312.9063,131.6875 313.4688,131.9844 L313.4688,134.7031 Q312.8438,134.125 312.25,133.8594 Q311.6563,133.5781 311.0313,133.5781 Q309.6875,133.5781 309,134.6563 Q308.3125,135.7188 308.3125,137.8125 Q308.3125,139.9063 309,140.9844 Q309.6875,142.0469 311.0313,142.0469 Q311.6563,142.0469 312.25,141.7813 Q312.8438,141.5 313.4688,140.9219 L313.4688,143.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="324.5" y="142.1543">G</text>
@@ -133,8 +133,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="162" y2="162"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="170" y2="170"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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>
@@ -143,8 +143,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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>
@@ -153,8 +153,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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>
@@ -163,16 +163,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhpq64ku6cc5)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffdeu0a5xfkch)" 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/t00054_class_mermaid.svg b/docs/test_cases/t00054_class_mermaid.svg
index 51431ed8..f7a33fd2 100644
--- a/docs/test_cases/t00054_class_mermaid.svg
+++ b/docs/test_cases/t00054_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L4">
+        <a transform="translate(20.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L4">
           <g title="b" id="classId-C_0000252416999805673718-0" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L8">
+        <a transform="translate(121.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L8">
           <g title="d" id="classId-C_0001569559620782547158-1" class="node default clickable">
             <rect height="57" width="77.21875" y="-28.5" x="-38.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.609375" x1="-38.609375" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L12">
+        <a transform="translate(222.390625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L12">
           <g title="g" id="classId-C_0000595494794840378320-2" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L18">
+        <a transform="translate(328.734375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L18">
           <g title="C" id="classId-C_0000540054955081677892-3" class="node default clickable">
             <rect height="57" width="87.90625" y="-28.5" x="-43.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.953125" x1="-43.953125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L23">
+        <a transform="translate(465.75, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L23">
           <g title="F" id="classId-C_0000446694692150903211-4" class="node default clickable">
             <rect height="57" width="86.125" y="-28.5" x="-43.0625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="43.0625" x1="-43.0625" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L14">
+        <a transform="translate(572.09375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L14">
           <g title="A" id="classId-C_0000917656824503504804-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L15">
+        <a transform="translate(648.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L15">
           <g title="B" id="classId-C_0001235773045370563004-6" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L25">
+        <a transform="translate(725.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L25">
           <g title="G" id="classId-C_0001365815261671395853-7" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L3">
+        <a transform="translate(801.34375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L3">
           <g title="a" id="classId-C_0001158868779503074564-8" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L11">
+        <a transform="translate(873.4609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L11">
           <g title="f" id="classId-C_0002123626454198320938-9" class="node default clickable">
             <rect height="57" width="20.328125" y="-28.5" x="-10.1640625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="10.1640625" x1="-10.1640625" class="divider"/>
@@ -242,7 +242,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L20">
+        <a transform="translate(1008.25, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L20">
           <g title="D" id="classId-C_0001266390196945323478-10" class="node default clickable">
             <rect height="57" width="149.25" y="-28.5" x="-74.625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.625" x1="-74.625" class="divider"/>
@@ -261,7 +261,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L21">
+        <a transform="translate(1207.0546875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L21">
           <g title="E" id="classId-C_0000134928214982255105-11" class="node default clickable">
             <rect height="57" width="148.359375" y="-28.5" x="-74.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.1796875" x1="-74.1796875" class="divider"/>
@@ -280,7 +280,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L28">
+        <a transform="translate(1392.109375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L28">
           <g title="h" id="classId-C_0001592677999268391183-12" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -304,7 +304,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L29">
+        <a transform="translate(1563.859375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L29">
           <g title="i" id="classId-C_0000441521323390223397-13" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -328,7 +328,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L30">
+        <a transform="translate(1735.609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L30">
           <g title="j" id="classId-C_0000499334434426587347-14" class="node default clickable">
             <rect height="101" width="121.75" y="-50.5" x="-60.875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -352,7 +352,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L7">
+        <a transform="translate(1884.65625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L7">
           <g title="c" id="classId-C_0001168031834662719964-15" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
@@ -371,7 +371,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00054/t00054.cc#L9">
+        <a transform="translate(2011, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00054/t00054.cc#L9">
           <g title="e" id="classId-C_0002037550833462858827-16" class="node default clickable">
             <rect height="57" width="76.34375" y="-28.5" x="-38.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="38.171875" x1="-38.171875" class="divider"/>
diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg
index 353472dd..294ccbfa 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="f2mdfxbmwcz4n" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1l9o006u5ypuj" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2mdfxbmwcz4n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l9o006u5ypuj)" 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/t00055_class_mermaid.svg b/docs/test_cases/t00055_class_mermaid.svg
index 1a1c1ffd..beedb800 100644
--- a/docs/test_cases/t00055_class_mermaid.svg
+++ b/docs/test_cases/t00055_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L3">
           <g title="A" id="classId-C_0001697191682863715554-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L4">
+        <a transform="translate(97.84375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L4">
           <g title="B" id="classId-C_0000188599859894721517-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -90,7 +90,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L5">
+        <a transform="translate(174.40625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L5">
           <g title="C" id="classId-C_0000625177137967392996-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L6">
+        <a transform="translate(250.96875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L6">
           <g title="D" id="classId-C_0001046415640323289221-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,7 +128,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L7">
+        <a transform="translate(327.0859375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L7">
           <g title="E" id="classId-C_0000702117239243796422-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -147,7 +147,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L8">
+        <a transform="translate(402.3125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L8">
           <g title="F" id="classId-C_0001511375015718046137-5" class="node default clickable">
             <rect height="57" width="24.78125" y="-28.5" x="-12.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -166,7 +166,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L9">
+        <a transform="translate(478.4296875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L9">
           <g title="G" id="classId-C_0000651600874645139639-6" class="node default clickable">
             <rect height="57" width="27.453125" y="-28.5" x="-13.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -185,7 +185,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L10">
+        <a transform="translate(555.4375, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L10">
           <g title="H" id="classId-C_0000374142601071476038-7" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -204,7 +204,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L11">
+        <a transform="translate(628.4453125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L11">
           <g title="I" id="classId-C_0000295372236079742697-8" class="node default clickable">
             <rect height="57" width="19.453125" y="-28.5" x="-9.7265625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -223,7 +223,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00055/t00055.cc#L12">
+        <a transform="translate(700.125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00055/t00055.cc#L12">
           <g title="J" id="classId-C_0000769231292718551090-9" class="node default clickable">
             <rect height="57" width="23.90625" y="-28.5" x="-11.953125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="11.953125" x1="-11.953125" class="divider"/>
diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg
index 0c6695a1..68f3d7d2 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="fbdhnt3aq3mz1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lijswpzf1ljf" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L8" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L8" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L11" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L11" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L16" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L16" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L20" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L20" xlink:show="new" xlink:title="iterable" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L27" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L27" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L30" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L30" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L46" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L46" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L49" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L49" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L53" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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>
@@ -118,15 +118,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="382" y2="382"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="390" y2="390"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L54" 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="396"/>
       <ellipse cx="848" cy="401" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L54" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L54" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L54" 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="404.2104">a : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L60" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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>
@@ -135,15 +135,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="52.5" y2="52.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="60.5" y2="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L61" 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="66.5"/>
       <ellipse cx="953" cy="71.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L61" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L61" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L61" 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="74.7104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L70" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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>
@@ -152,15 +152,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="212.5" y2="212.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="220.5" y2="220.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L71" 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="226.5"/>
       <ellipse cx="495" cy="231.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L71" 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="234.7104">c : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L76" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L76" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L80" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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>
@@ -179,29 +179,29 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L81" 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="54"/>
       <ellipse cx="298.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L81" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L81" 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="62.2104">e1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L82" 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="66.8047"/>
       <ellipse cx="298.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L82" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L82" 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="75.0151">e2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L83" 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="79.6094"/>
       <ellipse cx="298.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L83" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L83" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L83" 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="87.8198">e3 : T3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbdhnt3aq3mz1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L88" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lijswpzf1ljf)" 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>
@@ -210,25 +210,25 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L89" 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="54"/>
       <ellipse cx="60" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L89" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L89" 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="62.2104">f1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L90" 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="66.8047"/>
       <ellipse cx="60" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L90" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L90" 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="75.0151">f2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L91" 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="79.6094"/>
       <ellipse cx="60" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L91" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L91" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L91" 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="87.8198">f3 : T3</text>
     </a>
     <path d="M669.56,433.19 C697.84,448.52 729.06,465.18 758,480 C789.06,495.91 824.03,512.91 852.89,526.69 " fill="none" id="C_0000137304962071054497-&gt;C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg
index 0096bfdd..71004f59 100644
--- a/docs/test_cases/t00056_class_mermaid.svg
+++ b/docs/test_cases/t00056_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1519.96484375 778" style="max-width: 1519.96px; background-color: white;" width="1519.96484375" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 1563.30078125 778" style="max-width: 1563.3px; background-color: white;" width="1563.30078125" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,23 +50,23 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1334.92578125,557L1334.92578125,562.6666666666666C1334.92578125,568.3333333333334,1334.92578125,579.6666666666666,1310.4147135416667,596.6751257333266C1285.9036458333333,613.6835847999864,1236.8815104166667,636.3671695999728,1212.3704427083333,647.708961999966L1187.859375,659.0507543999593"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M442.21662234042554,513L468.7430186170213,526C495.26941489361707,539,548.3222074468085,565,569.2033450183964,583.6666666666666C590.0844825899843,602.3333333333334,578.7939651799687,613.6666666666666,573.1487064749608,619.3333333333334L567.503447769953,625"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M324.58725066489365,513L312.4001828457447,526C300.21311502659574,539,275.8389793882979,565,263.6519115691489,585.5C251.46484375,606,251.46484375,621,251.46484375,628.5L251.46484375,636"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M1349.37109375,557L1349.37109375,562.6666666666666C1349.37109375,568.3333333333334,1349.37109375,579.6666666666666,1322.6888020833333,597.0184078643023C1296.0065104166667,614.3701490619378,1242.6419270833333,637.7402981238756,1215.9596354166667,649.4253726548445L1189.27734375,661.1104471858134"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M442.21662234042554,513L468.7430186170213,526C495.26941489361707,539,548.3222074468085,565,568.8219110150709,584.0495471448032C589.3216145833334,603.0990942896065,577.2682291666666,615.1981885792128,571.2415364583334,621.247735724016L565.21484375,627.2972828688193"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M325.0639295212766,513L313.03374335106383,526C301.00355718085103,539,276.94318484042554,565,264.91299867021274,585.5C252.8828125,606,252.8828125,621,252.8828125,628.5L252.8828125,636"/>
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M587.078125,295.9922813969692L549.5013020833334,305.99356783080765C511.9244791666667,315.9948542646461,436.7708333333333,335.9974271323231,399.1940104166667,358.99871356616154C361.6171875,382,361.6171875,408,361.6171875,421L361.6171875,434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M853.78125,295.9922813969692L891.3580729166666,305.99356783080765C928.9348958333334,315.9948542646461,1004.0885416666666,335.9974271323231,1041.6653645833333,365.58204689949486C1079.2421875,395.1666666666667,1079.2421875,434.3333333333333,1079.2421875,473.5C1079.2421875,512.6666666666666,1079.2421875,551.8333333333334,1081.9183538732393,582.5833333333334C1084.5945202464789,613.3333333333334,1089.9468529929577,635.6666666666666,1092.623019366197,646.8333333333334L1095.2991857394366,658"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M948.2578125,513L948.2578125,526C948.2578125,539,948.2578125,565,964.6678648278561,589.1666666666666C981.077917155712,613.3333333333334,1013.8980218114242,635.6666666666666,1030.3080741392803,646.8333333333334L1046.7181264671362,658"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M853.78125,295.9922813969692L891.3580729166666,305.99356783080765C928.9348958333334,315.9948542646461,1004.0885416666666,335.9974271323231,1041.6653645833333,365.58204689949486C1079.2421875,395.1666666666667,1079.2421875,434.3333333333333,1079.2421875,473.5C1079.2421875,512.6666666666666,1079.2421875,551.8333333333334,1082.0670297828638,582.5833333333334C1084.8918720657277,613.3333333333334,1090.5415566314553,635.6666666666666,1093.366398914319,646.8333333333334L1096.191241197183,658"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M948.2578125,513L948.2578125,526C948.2578125,539,948.2578125,565,964.8165407374804,589.1666666666666C981.3752689749608,613.3333333333334,1014.4927254499217,635.6666666666666,1031.0514536874023,646.8333333333334L1047.6101819248827,658"/>
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M720.4296875,109L720.4296875,118.33333333333333C720.4296875,127.66666666666667,720.4296875,146.33333333333334,720.4296875,165C720.4296875,183.66666666666666,720.4296875,202.33333333333334,720.4296875,211.66666666666666L720.4296875,221"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1334.92578125,300L1334.92578125,309.3333333333333C1334.92578125,318.6666666666667,1334.92578125,337.3333333333333,1334.92578125,352.3333333333333C1334.92578125,367.3333333333333,1334.92578125,378.6666666666667,1334.92578125,384.3333333333333L1334.92578125,390"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M1349.37109375,300L1349.37109375,309.3333333333333C1349.37109375,318.6666666666667,1349.37109375,337.3333333333333,1349.37109375,352.3333333333333C1349.37109375,367.3333333333333,1349.37109375,378.6666666666667,1349.37109375,384.3333333333333L1349.37109375,390"/>
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M626.3488031914893,502L604.8740026595744,516.8333333333334C583.3992021276596,531.6666666666666,540.4496010638298,561.3333333333334,518.8565371320714,581.8333333333334C497.263473200313,602.3333333333334,497.026946400626,613.6666666666666,496.9086830007825,619.3333333333334L496.79041960093895,625"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M603.2427692819149,502L569.7420212765957,516.8333333333334C536.2412732712766,531.6666666666666,469.2397772606383,561.3333333333334,440.6894645057103,581.8333333333334C412.13915175078245,602.3333333333334,422.04002225156495,613.6666666666666,426.99045750195614,619.3333333333334L431.9408927523474,625"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M702.1845744680851,502L720.1798537234041,516.8333333333334C738.1751329787234,531.6666666666666,774.1656914893616,561.3333333333334,827.4135749113475,588.9103288252453C880.6614583333334,616.4873243171572,951.1666666666666,641.9746486343146,986.4192708333334,654.7183107928931L1021.671875,667.4619729514718"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M692.8045877659574,502L705.9178856382978,516.8333333333334C719.0311835106382,531.6666666666666,745.2577792553192,561.3333333333334,800.0689937943262,589.491233005157C854.8802083333334,617.6491326769807,938.2760416666666,644.2982653539615,979.9739583333334,657.6228316924519L1021.671875,670.9473980309423"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M603.5867021276596,502L570.264960106383,516.8333333333334C536.9432180851064,531.6666666666666,470.29973404255315,561.3333333333334,441.85297979514195,581.8333333333334C413.40622554773086,602.3333333333334,423.1562010954617,613.6666666666666,428.0311888693271,619.3333333333334L432.9061766431925,625"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M702.1845744680851,502L720.1798537234041,516.8333333333334C738.1751329787234,531.6666666666666,774.1656914893616,561.3333333333334,827.6499030363475,588.9343091458506C881.1341145833334,616.5352849583679,952.1119791666666,642.070569916736,987.6009114583334,654.8382123959199L1023.08984375,667.6058548751039"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M692.8045877659574,502L705.9178856382978,516.8333333333334C719.0311835106382,531.6666666666666,745.2577792553192,561.3333333333334,800.3053219193262,589.509981559936C855.3528645833334,617.6866297865387,939.2213541666666,644.3732595730775,981.1555989583334,657.7165744663469L1023.08984375,671.0598893596162"/>
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M403.75,131L403.75,136.66666666666666C403.75,142.33333333333334,403.75,153.66666666666666,403.75,165C403.75,176.33333333333334,403.75,187.66666666666666,403.75,193.33333333333334L403.75,199"/>
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M114.2109375,131L114.2109375,136.66666666666666C114.2109375,142.33333333333334,114.2109375,153.66666666666666,114.2109375,168.66666666666666C114.2109375,183.66666666666666,114.2109375,202.33333333333334,114.2109375,211.66666666666666L114.2109375,221"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(1334.92578125, 591)" class="edgeLabel">
+        <g transform="translate(1349.37109375, 591)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -88,7 +88,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(251.46484375, 591)" class="edgeLabel">
+        <g transform="translate(252.8828125, 591)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -143,7 +143,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1334.92578125, 356)" class="edgeLabel">
+        <g transform="translate(1349.37109375, 356)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -165,7 +165,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(402.23828125, 591)" class="edgeLabel">
+        <g transform="translate(403.65625, 591)" class="edgeLabel">
           <g transform="translate(-9.3359375, -9)" class="label">
             <foreignObject height="18" width="18.671875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -222,7 +222,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L8">
+        <a transform="translate(114.2109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L8">
           <g title="greater_than_simple" id="classId-C_0000902541696362244204-0" class="node default clickable">
             <rect height="79" width="212.421875" y="-39.5" x="-106.2109375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="106.2109375" x1="-106.2109375" class="divider"/>
@@ -241,11 +241,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L11">
+        <a transform="translate(403.75, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L11">
           <g title="greater_than_with_requires" id="classId-C_0001830716585637735576-1" class="node default clickable">
             <rect height="123" width="266.65625" y="-61.5" x="-133.328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="133.328125" x1="-133.328125" class="divider"/>
-            <line y2="28.5" y1="28.5" x2="133.328125" x1="-133.328125" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="133.328125" x1="-133.328125" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -54)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -257,20 +257,20 @@
                   <span class="nodeLabel">greater_than_with_requires&lt;T,P&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -125.828125, 2)" height="18" width="152.28125">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"sizeof (l) &gt; sizeof (r)"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -125.828125, 36)" height="18" width="64.109375">
+              <foreignObject transform="translate( -125.828125, 14)" height="18" width="64.109375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T l,P r)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -125.828125, 36)" height="18" width="156.71875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"sizeof(l) : &gt; sizeof (r)"</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1104.765625, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L16">
+        <a transform="translate(1106.18359375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L16">
           <g title="max_four_bytes" id="classId-C_0000385255522691733325-2" class="node default clickable">
             <rect height="79" width="166.1875" y="-39.5" x="-83.09375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="83.09375" x1="-83.09375" class="divider"/>
@@ -289,11 +289,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L20">
+        <a transform="translate(495.27734375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L20">
           <g title="iterable" id="classId-C_0000392540961352249242-3" class="node default clickable">
-            <rect height="145" width="145.546875" y="-72.5" x="-72.7734375" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="72.7734375" x1="-72.7734375" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="72.7734375" x1="-72.7734375" class="divider"/>
+            <rect height="145" width="139.875" y="-72.5" x="-69.9375" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="69.9375" x1="-69.9375" class="divider"/>
+            <line y2="-4.5" y1="-4.5" x2="69.9375" x1="-69.9375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -65)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -305,25 +305,25 @@
                   <span class="nodeLabel">iterable&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.2734375, -9)" height="18" width="130.546875">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"container.begin()"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -65.2734375, 13)" height="18" width="118.09375">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"container.end()"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -65.2734375, 47)" height="18" width="101.765625">
+              <foreignObject transform="translate( -62.4375, 3)" height="18" width="101.765625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T container)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -62.4375, 25)" height="18" width="124.875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"container.begin()</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -62.4375, 47)" height="18" width="112.421875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"container.end()</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(251.46484375, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L27">
+        <a transform="translate(252.8828125, 697.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L27">
           <g title="has_value_type" id="classId-C_0001850394311226276678-4" class="node default clickable">
             <rect height="123" width="195.0625" y="-61.5" x="-97.53125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="97.53125" x1="-97.53125" class="divider"/>
@@ -352,11 +352,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L30">
+        <a transform="translate(1349.37109375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L30">
           <g title="convertible_to_string" id="classId-C_0000137304962071054497-5" class="node default clickable">
-            <rect height="167" width="354.078125" y="-83.5" x="-177.0390625" class="outer title-state"/>
-            <line y2="-31.5" y1="-31.5" x2="177.0390625" x1="-177.0390625" class="divider"/>
-            <line y2="50.5" y1="50.5" x2="177.0390625" x1="-177.0390625" class="divider"/>
+            <rect height="167" width="411.859375" y="-83.5" x="-205.9296875" class="outer title-state"/>
+            <line y2="-31.5" y1="-31.5" x2="205.9296875" x1="-205.9296875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="205.9296875" x1="-205.9296875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -76)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -368,30 +368,30 @@
                   <span class="nodeLabel">convertible_to_string&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -169.5390625, -20)" height="18" width="99.40625">
+              <foreignObject transform="translate( -198.4296875, -20)" height="18" width="99.40625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"std::string{s}"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -169.5390625, 2)" height="18" width="201.6875">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"{std::to_string(s)} noexcept"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -169.5390625, 24)" height="18" width="339.078125">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -169.5390625, 58)" height="18" width="43.953125">
+              <foreignObject transform="translate( -198.4296875, 14)" height="18" width="43.953125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T s)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -198.4296875, 36)" height="18" width="259.484375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"{std::to_string(s) : rbrace; noexcept"</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -198.4296875, 58)" height="18" width="396.859375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"{std::to_string(s) : rbrace; -&gt; std::same_as&lt;std::string&gt;"</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L46">
+        <a transform="translate(361.6171875, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L46">
           <g title="iterable_with_value_type" id="classId-C_0001043398062146751019-6" class="node default clickable">
             <rect height="79" width="232.875" y="-39.5" x="-116.4375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="116.4375" x1="-116.4375" class="divider"/>
@@ -410,7 +410,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L49">
+        <a transform="translate(720.4296875, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L49">
           <g title="iterable_or_small_value_type" id="classId-C_0000866345615551223718-7" class="node default clickable">
             <rect height="79" width="266.703125" y="-39.5" x="-133.3515625" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="133.3515625" x1="-133.3515625" class="divider"/>
@@ -429,7 +429,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L53">
+        <a transform="translate(948.2578125, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L53">
           <g title="A" id="classId-C_0001418333499545421661-8" class="node default clickable">
             <rect height="79" width="182.1875" y="-39.5" x="-91.09375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="91.09375" x1="-91.09375" class="divider"/>
@@ -453,7 +453,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L60">
+        <a transform="translate(720.4296875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L60">
           <g title="B" id="classId-C_0001814355496814977880-9" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -477,7 +477,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1334.92578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L70">
+        <a transform="translate(1349.37109375, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L70">
           <g title="C" id="classId-C_0001512618198241549089-10" class="node default clickable">
             <rect height="79" width="222.171875" y="-39.5" x="-111.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="111.0859375" x1="-111.0859375" class="divider"/>
@@ -501,7 +501,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L76">
+        <a transform="translate(667.609375, 473.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L76">
           <g title="D" id="classId-C_0001635109601630198093-11" class="node default clickable">
             <rect height="57" width="279.109375" y="-28.5" x="-139.5546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="139.5546875" x1="-139.5546875" class="divider"/>
@@ -520,7 +520,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L80">
+        <a transform="translate(403.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L80">
           <g title="E" id="classId-C_0001429225801945621089-12" class="node default clickable">
             <rect height="123" width="109.265625" y="-61.5" x="-54.6328125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.6328125" x1="-54.6328125" class="divider"/>
@@ -554,7 +554,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00056/t00056.cc#L88">
+        <a transform="translate(114.2109375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00056/t00056.cc#L88">
           <g title="F" id="classId-C_0000856301122972546034-13" class="node default clickable">
             <rect height="123" width="108.375" y="-61.5" x="-54.1875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="54.1875" x1="-54.1875" class="divider"/>
diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg
index 0a4db521..df1f625b 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="476px" preserveAspectRatio="none" style="width:1040px;height:476px;" version="1.1" viewBox="0 0 1040 476" width="1040px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fe5xqfrg94esc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1mqwctz187pnq" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="235.5"/>
       <ellipse cx="21" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,257.1406 Q23.3906,257.4375 22.75,257.5781 Q22.1094,257.7344 21.4063,257.7344 Q18.9063,257.7344 17.5781,256.0938 Q16.2656,254.4375 16.2656,251.3125 Q16.2656,248.1875 17.5781,246.5313 Q18.9063,244.875 21.4063,244.875 Q22.1094,244.875 22.75,245.0313 Q23.4063,245.1875 23.9688,245.4844 L23.9688,248.2031 Q23.3438,247.625 22.75,247.3594 Q22.1563,247.0781 21.5313,247.0781 Q20.1875,247.0781 19.5,248.1563 Q18.8125,249.2188 18.8125,251.3125 Q18.8125,253.4063 19.5,254.4844 Q20.1875,255.5469 21.5313,255.5469 Q22.1563,255.5469 22.75,255.2813 Q23.3438,255 23.9688,254.4219 L23.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="35" y="255.6543">t00057_A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="281.5"/>
       <ellipse cx="17" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="289.7104">a1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="235.5"/>
       <ellipse cx="147" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M149.9688,257.1406 Q149.3906,257.4375 148.75,257.5781 Q148.1094,257.7344 147.4063,257.7344 Q144.9063,257.7344 143.5781,256.0938 Q142.2656,254.4375 142.2656,251.3125 Q142.2656,248.1875 143.5781,246.5313 Q144.9063,244.875 147.4063,244.875 Q148.1094,244.875 148.75,245.0313 Q149.4063,245.1875 149.9688,245.4844 L149.9688,248.2031 Q149.3438,247.625 148.75,247.3594 Q148.1563,247.0781 147.5313,247.0781 Q146.1875,247.0781 145.5,248.1563 Q144.8125,249.2188 144.8125,251.3125 Q144.8125,253.4063 145.5,254.4844 Q146.1875,255.5469 147.5313,255.5469 Q148.1563,255.5469 148.75,255.2813 Q149.3438,255 149.9688,254.4219 L149.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="161" y="255.6543">t00057_B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="281.5"/>
       <ellipse cx="143" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="289.7104">b1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="235.5"/>
       <ellipse cx="273" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M275.9688,257.1406 Q275.3906,257.4375 274.75,257.5781 Q274.1094,257.7344 273.4063,257.7344 Q270.9063,257.7344 269.5781,256.0938 Q268.2656,254.4375 268.2656,251.3125 Q268.2656,248.1875 269.5781,246.5313 Q270.9063,244.875 273.4063,244.875 Q274.1094,244.875 274.75,245.0313 Q275.4063,245.1875 275.9688,245.4844 L275.9688,248.2031 Q275.3438,247.625 274.75,247.3594 Q274.1563,247.0781 273.5313,247.0781 Q272.1875,247.0781 271.5,248.1563 Q270.8125,249.2188 270.8125,251.3125 Q270.8125,253.4063 271.5,254.4844 Q272.1875,255.5469 273.5313,255.5469 Q274.1563,255.5469 274.75,255.2813 Q275.3438,255 275.9688,254.4219 L275.9688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="287" y="255.6543">t00057_C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="281.5"/>
       <ellipse cx="269" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="289.7104">c1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="226"/>
       <ellipse cx="399.5" cy="244.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M402.4688,250.6094 Q401.8906,250.9063 401.25,251.0469 Q400.6094,251.2031 399.9063,251.2031 Q397.4063,251.2031 396.0781,249.5625 Q394.7656,247.9063 394.7656,244.7813 Q394.7656,241.6563 396.0781,240 Q397.4063,238.3438 399.9063,238.3438 Q400.6094,238.3438 401.25,238.5 Q401.9063,238.6563 402.4688,238.9531 L402.4688,241.6719 Q401.8438,241.0938 401.25,240.8281 Q400.6563,240.5469 400.0313,240.5469 Q398.6875,240.5469 398,241.625 Q397.3125,242.6875 397.3125,244.7813 Q397.3125,246.875 398,247.9531 Q398.6875,249.0156 400.0313,249.0156 Q400.6563,249.0156 401.25,248.75 Q401.8438,248.4688 402.4688,247.8906 L402.4688,250.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="419" y="242.1387">«union»</text>
@@ -63,73 +63,73 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="263.9375" y2="263.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="271.9375" y2="271.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="277.9375"/>
       <ellipse cx="395.5" cy="282.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="286.1479">d1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="290.7422"/>
       <ellipse cx="395.5" cy="295.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="298.9526">d2 : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="223"/>
       <ellipse cx="610.75" cy="239" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.7188,244.6406 Q613.1406,244.9375 612.5,245.0781 Q611.8594,245.2344 611.1563,245.2344 Q608.6563,245.2344 607.3281,243.5938 Q606.0156,241.9375 606.0156,238.8125 Q606.0156,235.6875 607.3281,234.0313 Q608.6563,232.375 611.1563,232.375 Q611.8594,232.375 612.5,232.5313 Q613.1563,232.6875 613.7188,232.9844 L613.7188,235.7031 Q613.0938,235.125 612.5,234.8594 Q611.9063,234.5781 611.2813,234.5781 Q609.9375,234.5781 609.25,235.6563 Q608.5625,236.7188 608.5625,238.8125 Q608.5625,240.9063 609.25,241.9844 Q609.9375,243.0469 611.2813,243.0469 Q611.9063,243.0469 612.5,242.7813 Q613.0938,242.5 613.7188,241.9219 L613.7188,244.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="631.25" y="243.1543">t00057_E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="255" y2="255"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="263" y2="263"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="269"/>
       <ellipse cx="522.5" cy="274" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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.2104">coordinates : t00057_E::(anonymous_739)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="281.8047"/>
       <ellipse cx="522.5" cy="286.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="290.0151">e : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="294.6094"/>
       <ellipse cx="522.5" cy="299.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="302.8198">height : t00057_E::(anonymous_807)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="389"/>
       <ellipse cx="466.5" cy="405" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.4688,410.6406 Q468.8906,410.9375 468.25,411.0781 Q467.6094,411.2344 466.9063,411.2344 Q464.4063,411.2344 463.0781,409.5938 Q461.7656,407.9375 461.7656,404.8125 Q461.7656,401.6875 463.0781,400.0313 Q464.4063,398.375 466.9063,398.375 Q467.6094,398.375 468.25,398.5313 Q468.9063,398.6875 469.4688,398.9844 L469.4688,401.7031 Q468.8438,401.125 468.25,400.8594 Q467.6563,400.5781 467.0313,400.5781 Q465.6875,400.5781 465,401.6563 Q464.3125,402.7188 464.3125,404.8125 Q464.3125,406.9063 465,407.9844 Q465.6875,409.0469 467.0313,409.0469 Q467.6563,409.0469 468.25,408.7813 Q468.8438,408.5 469.4688,407.9219 L469.4688,410.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="152" x="480.5" y="409.1543">t00057_E::(coordinates)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="421" y2="421"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="429" y2="429"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="435"/>
       <ellipse cx="462.5" cy="440" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="443.2104">x : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="447.8047"/>
       <ellipse cx="462.5" cy="452.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="456.0151">y : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="386"/>
       <ellipse cx="686" cy="404.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M688.9688,410.6094 Q688.3906,410.9063 687.75,411.0469 Q687.1094,411.2031 686.4063,411.2031 Q683.9063,411.2031 682.5781,409.5625 Q681.2656,407.9063 681.2656,404.7813 Q681.2656,401.6563 682.5781,400 Q683.9063,398.3438 686.4063,398.3438 Q687.1094,398.3438 687.75,398.5 Q688.4063,398.6563 688.9688,398.9531 L688.9688,401.6719 Q688.3438,401.0938 687.75,400.8281 Q687.1563,400.5469 686.5313,400.5469 Q685.1875,400.5469 684.5,401.625 Q683.8125,402.6875 683.8125,404.7813 Q683.8125,406.875 684.5,407.9531 Q685.1875,409.0156 686.5313,409.0156 Q687.1563,409.0156 687.75,408.75 Q688.3438,408.4688 688.9688,407.8906 L688.9688,410.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="734" y="402.1387">«union»</text>
@@ -137,105 +137,105 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="423.9375" y2="423.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="431.9375" y2="431.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="437.9375"/>
       <ellipse cx="682" cy="442.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="446.1479">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="450.7422"/>
       <ellipse cx="682" cy="455.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="458.9526">z : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L32" target="_top" title="t00057_G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="60.8047" id="C_0001592909736406415155" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="812.5" y="235.5"/>
       <ellipse cx="827.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M830.4688,257.1406 Q829.8906,257.4375 829.25,257.5781 Q828.6094,257.7344 827.9063,257.7344 Q825.4063,257.7344 824.0781,256.0938 Q822.7656,254.4375 822.7656,251.3125 Q822.7656,248.1875 824.0781,246.5313 Q825.4063,244.875 827.9063,244.875 Q828.6094,244.875 829.25,245.0313 Q829.9063,245.1875 830.4688,245.4844 L830.4688,248.2031 Q829.8438,247.625 829.25,247.3594 Q828.6563,247.0781 828.0313,247.0781 Q826.6875,247.0781 826,248.1563 Q825.3125,249.2188 825.3125,251.3125 Q825.3125,253.4063 826,254.4844 Q826.6875,255.5469 828.0313,255.5469 Q828.6563,255.5469 829.25,255.2813 Q829.8438,255 830.4688,254.4219 L830.4688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="841.5" y="255.6543">t00057_G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="903.5" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="818.5" y="281.5"/>
       <ellipse cx="823.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L33" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="832.5" y="289.7104">g1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L36" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="137.6328" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="357.5" y="8"/>
       <ellipse cx="397.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M400.2188,29.6406 Q399.6406,29.9375 399,30.0781 Q398.3594,30.2344 397.6563,30.2344 Q395.1563,30.2344 393.8281,28.5938 Q392.5156,26.9375 392.5156,23.8125 Q392.5156,20.6875 393.8281,19.0313 Q395.1563,17.375 397.6563,17.375 Q398.3594,17.375 399,17.5313 Q399.6563,17.6875 400.2188,17.9844 L400.2188,20.7031 Q399.5938,20.125 399,19.8594 Q398.4063,19.5781 397.7813,19.5781 Q396.4375,19.5781 395.75,20.6563 Q395.0625,21.7188 395.0625,23.8125 Q395.0625,25.9063 395.75,26.9844 Q396.4375,28.0469 397.7813,28.0469 Q398.4063,28.0469 399,27.7813 Q399.5938,27.5 400.2188,26.9219 L400.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="416.75" y="28.1543">t00057_R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="502.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="54"/>
       <ellipse cx="368.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L37" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="377.5" y="62.2104">a : struct t00057_A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="66.8047"/>
       <ellipse cx="368.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L38" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="377.5" y="75.0151">b : t00057_B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="79.6094"/>
       <ellipse cx="368.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L39" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L39" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="87.8198">c : struct t00057_C *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="92.4141"/>
       <ellipse cx="368.5" cy="97.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L40" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L40" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="377.5" y="100.6245">d : union t00057_D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="105.2188"/>
       <ellipse cx="368.5" cy="110.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L41" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L41" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="377.5" y="113.4292">e : struct t00057_E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="118.0234"/>
       <ellipse cx="368.5" cy="123.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L42" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L42" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="377.5" y="126.2339">f : struct t00057_F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="130.8281"/>
       <ellipse cx="368.5" cy="135.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L43" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L43" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="377.5" y="139.0386">g : struct t00057_G *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe5xqfrg94esc)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mqwctz187pnq)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="939.5" y="235.5"/>
       <ellipse cx="954.5" cy="251.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M957.4688,257.1406 Q956.8906,257.4375 956.25,257.5781 Q955.6094,257.7344 954.9063,257.7344 Q952.4063,257.7344 951.0781,256.0938 Q949.7656,254.4375 949.7656,251.3125 Q949.7656,248.1875 951.0781,246.5313 Q952.4063,244.875 954.9063,244.875 Q955.6094,244.875 956.25,245.0313 Q956.9063,245.1875 957.4688,245.4844 L957.4688,248.2031 Q956.8438,247.625 956.25,247.3594 Q955.6563,247.0781 955.0313,247.0781 Q953.6875,247.0781 953,248.1563 Q952.3125,249.2188 952.3125,251.3125 Q952.3125,253.4063 953,254.4844 Q953.6875,255.5469 955.0313,255.5469 Q955.6563,255.5469 956.25,255.2813 Q956.8438,255 957.4688,254.4219 L957.4688,257.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="968.5" y="255.6543">t00057_F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="267.5" y2="267.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="940.5" x2="1028.5" y1="275.5" y2="275.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="945.5" y="281.5"/>
       <ellipse cx="950.5" cy="286.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="959.5" y="289.7104">f1 : int</text>
     </a>
     <path d="M610.32,320.47 C595.89,343.04 579.48,368.72 566.53,388.97 " fill="none" id="C_0000682873132844345324&lt;-C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg
index 07bdad08..3c184d98 100644
--- a/docs/test_cases/t00057_class_mermaid.svg
+++ b/docs/test_cases/t00057_class_mermaid.svg
@@ -162,7 +162,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L3">
+        <a transform="translate(50.640625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L3">
           <g title="t00057_A" id="classId-C_0000940295970488928395-0" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -186,7 +186,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L7">
+        <a transform="translate(185.921875, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L7">
           <g title="t00057_B" id="classId-C_0001030391494410415852-1" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -210,7 +210,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L11">
+        <a transform="translate(321.203125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L11">
           <g title="t00057_C" id="classId-C_0000388213894542327772-2" class="node default clickable">
             <rect height="79" width="85.28125" y="-39.5" x="-42.640625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.640625" x1="-42.640625" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L15">
+        <a transform="translate(456.703125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L15">
           <g title="t00057_D" id="classId-C_0000784667124248020371-3" class="node default clickable">
             <rect height="123" width="85.71875" y="-61.5" x="-42.859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.859375" x1="-42.859375" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L20">
+        <a transform="translate(712.9453125, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L20">
           <g title="t00057_E" id="classId-C_0000682873132844345324-4" class="node default clickable">
             <rect height="123" width="326.765625" y="-61.5" x="-163.3828125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="163.3828125" x1="-163.3828125" class="divider"/>
@@ -297,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L22">
+        <a transform="translate(600.421875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L22">
           <g title="t00057_E##(coordinates)" id="classId-C_0000161676142413826748-5" class="node default clickable">
             <rect height="101" width="196.390625" y="-50.5" x="-98.1953125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="98.1953125" x1="-98.1953125" class="divider"/>
@@ -326,7 +326,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L26">
+        <a transform="translate(825.46875, 539.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L26">
           <g title="t00057_E##(height)" id="classId-C_0002265335931722752750-6" class="node default clickable">
             <rect height="123" width="153.703125" y="-61.5" x="-76.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.8515625" x1="-76.8515625" class="divider"/>
@@ -355,7 +355,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L32">
+        <a transform="translate(969.4140625, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L32">
           <g title="t00057_G" id="classId-C_0001592909736406415155-7" class="node default clickable">
             <rect height="79" width="86.171875" y="-39.5" x="-43.0859375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="43.0859375" x1="-43.0859375" class="divider"/>
@@ -379,7 +379,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/t00057.c#L36">
+        <a transform="translate(456.703125, 113.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/t00057.c#L36">
           <g title="t00057_R" id="classId-C_0000370583978606928327-8" class="node default clickable">
             <rect height="211" width="160.421875" y="-105.5" x="-80.2109375" class="outer title-state"/>
             <line y2="-75.5" y1="-75.5" x2="80.2109375" x1="-80.2109375" class="divider"/>
@@ -433,7 +433,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00057/include/t00057.h#L3">
+        <a transform="translate(1104.25, 348.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00057/include/t00057.h#L3">
           <g title="t00057_F" id="classId-C_0000085797106299568719-9" class="node default clickable">
             <rect height="79" width="83.5" y="-39.5" x="-41.75" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="41.75" x1="-41.75" class="divider"/>
diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md
index efd05e44..849c68a7 100644
--- a/docs/test_cases/t00058.md
+++ b/docs/test_cases/t00058.md
@@ -13,6 +13,9 @@ diagrams:
     plantuml:
       after:
         - '{{ alias("same_as_first_type<T,Args...>") }} ..> {{ alias("first_type<T,Args...>") }}'
+    mermaid:
+      after:
+        - '{{ alias("same_as_first_type<T,Args...>") }} ..> {{ alias("first_type<T,Args...>") }}'
 ```
 ## Source code
 File `tests/t00058/t00058.cc`
@@ -378,7 +381,7 @@ struct R {
               "type": "int"
             }
           ],
-          "type": "clanguml::t00058::A"
+          "type": "A"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg
index d17750c0..c3187c28 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="f1vbgp5ivb1w7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="faxoy4s52o4np" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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>
@@ -40,15 +40,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="529" y2="529"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="537" y2="537"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="543"/>
       <ellipse cx="104.5" cy="548" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="551.2104">a : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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>
@@ -57,22 +57,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="425" y2="425"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="433" y2="433"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="439"/>
       <ellipse cx="240.5" cy="444" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="447.2104">b : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="451.8047"/>
       <ellipse cx="240.5" cy="456.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="460.0151">bb : P</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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>
@@ -81,8 +81,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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>
@@ -91,8 +91,8 @@
       <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"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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>
@@ -101,26 +101,26 @@
       <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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vbgp5ivb1w7)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faxoy4s52o4np)" 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"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="17" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">aa : A&lt;int,int,double,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="66.8047"/>
       <ellipse cx="17" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="75.0151">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
     </a>
     <path d="M174.26,558.24 C185.3,579.75 200.17,608.73 211.31,630.43 " fill="none" id="C_0000798619347004821702-&gt;C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg
index bd93f2d2..ae38dfc9 100644
--- a/docs/test_cases/t00058_class_mermaid.svg
+++ b/docs/test_cases/t00058_class_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 652.8828125 647" style="max-width: 652.883px; background-color: white;" width="652.8828125" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="classDiagram" role="graphics-document document" viewBox="0 0 592.75 754" style="max-width: 592.75px; background-color: white;" width="592.75" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg g.classGroup text{fill:#9370DB;fill:#131300;stroke:none;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:10px;}#my-svg g.classGroup text .title{font-weight:bolder;}#my-svg .nodeLabel,#my-svg .edgeLabel{color:#131300;}#my-svg .edgeLabel .label rect{fill:#ECECFF;}#my-svg .label text{fill:#131300;}#my-svg .edgeLabel .label span{background:#ECECFF;}#my-svg .classTitle{font-weight:bolder;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .divider{stroke:#9370DB;stroke-width:1;}#my-svg g.clickable{cursor:pointer;}#my-svg g.classGroup rect{fill:#ECECFF;stroke:#9370DB;}#my-svg g.classGroup line{stroke:#9370DB;stroke-width:1;}#my-svg .classLabel .box{stroke:none;stroke-width:0;fill:#ECECFF;opacity:0.5;}#my-svg .classLabel .label{fill:#9370DB;font-size:10px;}#my-svg .relation{stroke:#333333;stroke-width:1;fill:none;}#my-svg .dashed-line{stroke-dasharray:3;}#my-svg .dotted-line{stroke-dasharray:1 2;}#my-svg #compositionStart,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #compositionEnd,#my-svg .composition{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #dependencyStart,#my-svg .dependency{fill:#333333!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionStart,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #extensionEnd,#my-svg .extension{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationStart,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #aggregationEnd,#my-svg .aggregation{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopStart,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg #lollipopEnd,#my-svg .lollipop{fill:#ECECFF!important;stroke:#333333!important;stroke-width:1;}#my-svg .edgeTerminals{font-size:11px;}#my-svg .classTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <defs>
@@ -50,17 +50,18 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M287.2421875,481L287.2421875,488.5C287.2421875,496,287.2421875,511,294.9073660714286,524.1666666666666C302.57254464285717,537.3333333333334,317.9029017857143,548.6666666666666,325.5680803571429,554.3333333333334L333.23325892857144,560"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M530.859375,492L530.859375,497.6666666666667C530.859375,503.3333333333333,530.859375,514.6666666666666,519.7422760770975,526C508.625177154195,537.3333333333334,486.39097930839006,548.6666666666666,475.27388038548753,554.3333333333334L464.15678146258506,560"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M182.7421875,341L182.7421875,345.1666666666667C182.7421875,349.3333333333333,182.7421875,357.6666666666667,191.04682326158942,367.8333333333333C199.35145902317882,378,215.9607305463576,390,224.26536630794703,396L232.57000206953643,402"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M391.7421875,341L391.7421875,345.1666666666667C391.7421875,349.3333333333333,391.7421875,357.6666666666667,383.4375517384106,367.8333333333333C375.13291597682115,378,358.52364445364236,390,350.21900869205297,396L341.91437293046357,402"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M438.2010075934579,234L430.4578709112149,238.16666666666666C422.71473422897196,242.33333333333334,407.22846086448595,250.66666666666666,399.48532418224295,259C391.7421875,267.3333333333333,391.7421875,275.6666666666667,391.7421875,279.8333333333333L391.7421875,284"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M512.3101635514018,234L515.4016987928348,238.16666666666666C518.4932340342679,242.33333333333334,524.6763045171339,250.66666666666666,527.767839758567,263.75C530.859375,276.8333333333333,530.859375,294.6666666666667,530.859375,312.5C530.859375,330.3333333333333,530.859375,348.1666666666667,530.859375,361.25C530.859375,374.3333333333333,530.859375,382.6666666666667,530.859375,386.8333333333333L530.859375,391"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M264.7935928254438,109L251.1183586045365,114.66666666666667C237.4431243836292,120.33333333333333,210.09265594181457,131.66666666666666,196.4174217209073,147.75C182.7421875,163.83333333333334,182.7421875,184.66666666666666,182.7421875,204C182.7421875,223.33333333333334,182.7421875,241.16666666666666,182.7421875,254.25C182.7421875,267.3333333333333,182.7421875,275.6666666666667,182.7421875,279.8333333333333L182.7421875,284"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M449.1167252218935,109L456.12461476824456,114.66666666666667C463.1325043145957,120.33333333333333,477.1482834072978,131.66666666666666,484.1561729536489,143C491.1640625,154.33333333333334,491.1640625,165.66666666666666,491.1640625,171.33333333333334L491.1640625,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M227.109375,481L227.109375,488.5C227.109375,496,227.109375,511,234.77455357142858,524.1666666666666C242.43973214285714,537.3333333333334,257.7700892857143,548.6666666666666,265.4352678571429,554.3333333333334L273.10044642857144,560"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M470.7265625,492L470.7265625,497.6666666666667C470.7265625,503.3333333333333,470.7265625,514.6666666666666,459.60946357709753,526C448.492364654195,537.3333333333334,426.25816680839006,548.6666666666666,415.14106788548753,554.3333333333334L404.02396896258506,560"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M122.609375,341L122.609375,345.1666666666667C122.609375,349.3333333333333,122.609375,357.6666666666667,130.91401076158942,367.8333333333333C139.21864652317882,378,155.8279180463576,390,164.13255380794703,396L172.43718956953643,402"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M331.609375,341L331.609375,345.1666666666667C331.609375,349.3333333333333,331.609375,357.6666666666667,323.3047392384106,367.8333333333333C315.00010347682115,378,298.39083195364236,390,290.08619619205297,396L281.78156043046357,402"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M378.0681950934579,234L370.3250584112149,238.16666666666666C362.58192172897196,242.33333333333334,347.09564836448595,250.66666666666666,339.352511682243,259C331.609375,267.3333333333333,331.609375,275.6666666666667,331.609375,279.8333333333333L331.609375,284"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M452.17735105140184,234L455.26888629283485,238.16666666666666C458.3604215342679,242.33333333333334,464.54349201713393,250.66666666666666,467.63502725856694,263.75C470.7265625,276.8333333333333,470.7265625,294.6666666666667,470.7265625,312.5C470.7265625,330.3333333333333,470.7265625,348.1666666666667,470.7265625,361.25C470.7265625,374.3333333333333,470.7265625,382.6666666666667,470.7265625,386.8333333333333L470.7265625,391"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M204.6607803254438,109L190.9855461045365,114.66666666666667C177.3103118836292,120.33333333333333,149.9598434418146,131.66666666666666,136.2846092209073,147.75C122.609375,163.83333333333334,122.609375,184.66666666666666,122.609375,204C122.609375,223.33333333333334,122.609375,241.16666666666666,122.609375,254.25C122.609375,267.3333333333333,122.609375,275.6666666666667,122.609375,279.8333333333333L122.609375,284"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M388.9839127218935,109L395.99180226824456,114.66666666666667C402.9996918145957,120.33333333333333,417.0154709072978,131.66666666666666,424.0233604536489,143C431.03125,154.33333333333334,431.03125,165.66666666666666,431.03125,171.33333333333334L431.03125,177"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M326.53125,639L326.53125,643.1666666666666C326.53125,647.3333333333334,326.53125,655.6666666666666,326.53125,664C326.53125,672.3333333333334,326.53125,680.6666666666666,326.53125,684.8333333333334L326.53125,689"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(287.2421875, 526)" class="edgeLabel">
+        <g transform="translate(227.109375, 526)" class="edgeLabel">
           <g transform="translate(-29.34375, -9)" class="label">
             <foreignObject height="18" width="58.6875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -71,7 +72,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(530.859375, 526)" class="edgeLabel">
+        <g transform="translate(470.7265625, 526)" class="edgeLabel">
           <g transform="translate(-29.34375, -9)" class="label">
             <foreignObject height="18" width="58.6875">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -126,7 +127,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(182.7421875, 205.5)" class="edgeLabel">
+        <g transform="translate(122.609375, 205.5)" class="edgeLabel">
           <g transform="translate(-13.5703125, -9)" class="label">
             <foreignObject height="18" width="27.140625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -137,7 +138,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(491.1640625, 143)" class="edgeLabel">
+        <g transform="translate(431.03125, 143)" class="edgeLabel">
           <g transform="translate(-13.5703125, -9)" class="label">
             <foreignObject height="18" width="27.140625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -148,9 +149,18 @@
             </foreignObject>
           </g>
         </g>
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
       </g>
       <g class="nodes">
-        <a transform="translate(91.9765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L11">
+        <a transform="translate(326.53125, 717.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L11">
           <g title="first_type" id="classId-C_0000039461943261269692-0" class="node default clickable">
             <rect height="57" width="167.953125" y="-28.5" x="-83.9765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="83.9765625" x1="-83.9765625" class="divider"/>
@@ -169,7 +179,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L22">
+        <a transform="translate(326.53125, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L22">
           <g title="same_as_first_type" id="classId-C_0001725820236573641307-1" class="node default clickable">
             <rect height="79" width="244.46875" y="-39.5" x="-122.234375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="122.234375" x1="-122.234375" class="divider"/>
@@ -188,7 +198,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(287.2421875, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L27">
+        <a transform="translate(227.109375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0000798619347004821702-2" class="node default clickable">
             <rect height="79" width="148.84375" y="-39.5" x="-74.421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -212,7 +222,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(530.859375, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33">
+        <a transform="translate(470.7265625, 441.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000420594889696591405-3" class="node default clickable">
             <rect height="101" width="148.84375" y="-50.5" x="-74.421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.421875" x1="-74.421875" class="divider"/>
@@ -241,7 +251,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(182.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L27">
+        <a transform="translate(122.609375, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L27">
           <g title="A" id="classId-C_0001724002183455178980-4" class="node default clickable">
             <rect height="57" width="229.21875" y="-28.5" x="-114.609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="114.609375" x1="-114.609375" class="divider"/>
@@ -260,7 +270,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(391.7421875, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33">
+        <a transform="translate(331.609375, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33">
           <g title="A" id="classId-C_0001372381231906520278-5" class="node default clickable">
             <rect height="57" width="88.78125" y="-28.5" x="-44.390625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="44.390625" x1="-44.390625" class="divider"/>
@@ -279,7 +289,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(491.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L33">
+        <a transform="translate(431.03125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L33">
           <g title="B" id="classId-C_0000290383080560130133-6" class="node default clickable">
             <rect height="57" width="307.4375" y="-28.5" x="-153.71875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="153.71875" x1="-153.71875" class="divider"/>
@@ -298,7 +308,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.6640625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00058/t00058.cc#L38">
+        <a transform="translate(326.53125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00058/t00058.cc#L38">
           <g title="R" id="classId-C_0001015108159699260009-7" class="node default clickable">
             <rect height="101" width="321.421875" y="-50.5" x="-160.7109375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="160.7109375" x1="-160.7109375" class="divider"/>
diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md
index 7d5f1293..31948576 100644
--- a/docs/test_cases/t00059.md
+++ b/docs/test_cases/t00059.md
@@ -167,6 +167,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "get_name",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -189,10 +190,12 @@ struct R {
             "line": 20,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "public",
+          "display_name": "get_sweetness",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -215,6 +218,7 @@ struct R {
             "line": 21,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "float"
         }
       ],
@@ -242,6 +246,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "get_name",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -264,10 +269,12 @@ struct R {
             "line": 26,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "public",
+          "display_name": "get_sweetness",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -290,6 +297,7 @@ struct R {
             "line": 27,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "float"
         }
       ],
@@ -317,6 +325,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "get_name",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -339,10 +348,12 @@ struct R {
             "line": 32,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "public",
+          "display_name": "get_bitterness",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -365,6 +376,7 @@ struct R {
             "line": 33,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "float"
         }
       ],
@@ -392,6 +404,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "get_name",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -414,10 +427,12 @@ struct R {
             "line": 38,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "public",
+          "display_name": "get_bitterness",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -440,6 +455,7 @@ struct R {
             "line": 39,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "float"
         }
       ],
@@ -467,6 +483,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "create_apple",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -489,10 +506,12 @@ struct R {
             "line": 44,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "TA"
         },
         {
           "access": "public",
+          "display_name": "create_orange",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -515,6 +534,7 @@ struct R {
             "line": 45,
             "translation_unit": "t00059.cc"
           },
+          "template_parameters": [],
           "type": "TO"
         }
       ],
@@ -566,13 +586,13 @@ struct R {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00059::gala_apple"
+          "type": "gala_apple"
         },
         {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00059::valencia_orange"
+          "type": "valencia_orange"
         }
       ],
       "type": "class"
@@ -601,13 +621,13 @@ struct R {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00059::empire_apple"
+          "type": "empire_apple"
         },
         {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00059::lima_orange"
+          "type": "lima_orange"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg
index 56680197..4616d5f9 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="678px" preserveAspectRatio="none" style="width:1199px;height:678px;" version="1.1" viewBox="0 0 1199 678" width="1199px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1xgfk7yesld6p" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fkftnndj1cf67" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="522" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="522" y="8"/>
       <ellipse cx="537" cy="26.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M539.9688,32.6094 Q539.3906,32.9063 538.75,33.0469 Q538.1094,33.2031 537.4063,33.2031 Q534.9063,33.2031 533.5781,31.5625 Q532.2656,29.9063 532.2656,26.7813 Q532.2656,23.6563 533.5781,22 Q534.9063,20.3438 537.4063,20.3438 Q538.1094,20.3438 538.75,20.5 Q539.4063,20.6563 539.9688,20.9531 L539.9688,23.6719 Q539.3438,23.0938 538.75,22.8281 Q538.1563,22.5469 537.5313,22.5469 Q536.1875,22.5469 535.5,23.625 Q534.8125,24.6875 534.8125,26.7813 Q534.8125,28.875 535.5,29.9531 Q536.1875,31.0156 537.5313,31.0156 Q538.1563,31.0156 538.75,30.75 Q539.3438,30.4688 539.9688,29.8906 L539.9688,32.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="549" y="24.1387">«concept»</text>
@@ -23,8 +23,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="528" y="80.9526">T{}</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="528" y="93.7573">t.get_name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="591" y="177"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="591" y="177"/>
       <ellipse cx="610.5" cy="195.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.4688,201.6094 Q612.8906,201.9063 612.25,202.0469 Q611.6094,202.2031 610.9063,202.2031 Q608.4063,202.2031 607.0781,200.5625 Q605.7656,198.9063 605.7656,195.7813 Q605.7656,192.6563 607.0781,191 Q608.4063,189.3438 610.9063,189.3438 Q611.6094,189.3438 612.25,189.5 Q612.9063,189.6563 613.4688,189.9531 L613.4688,192.6719 Q612.8438,192.0938 612.25,191.8281 Q611.6563,191.5469 611.0313,191.5469 Q609.6875,191.5469 609,192.625 Q608.3125,193.6875 608.3125,195.7813 Q608.3125,197.875 609,198.9531 Q609.6875,200.0156 611.0313,200.0156 Q611.6563,200.0156 612.25,199.75 Q612.8438,199.4688 613.4688,198.8906 L613.4688,201.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="623.5" y="193.1387">«concept»</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="592" x2="704" y1="235.7422" y2="235.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="597" y="249.9526">t.get_sweetness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="446" y="177"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="446" y="177"/>
       <ellipse cx="463.7" cy="195.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M466.6688,201.6094 Q466.0906,201.9063 465.45,202.0469 Q464.8094,202.2031 464.1063,202.2031 Q461.6063,202.2031 460.2781,200.5625 Q458.9656,198.9063 458.9656,195.7813 Q458.9656,192.6563 460.2781,191 Q461.6063,189.3438 464.1063,189.3438 Q464.8094,189.3438 465.45,189.5 Q466.1063,189.6563 466.6688,189.9531 L466.6688,192.6719 Q466.0438,192.0938 465.45,191.8281 Q464.8563,191.5469 464.2313,191.5469 Q462.8875,191.5469 462.2,192.625 Q461.5125,193.6875 461.5125,195.7813 Q461.5125,197.875 462.2,198.9531 Q462.8875,200.0156 464.2313,200.0156 Q464.8563,200.0156 465.45,199.75 Q466.0438,199.4688 466.6688,198.8906 L466.6688,201.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="476.3" y="193.1387">«concept»</text>
@@ -49,96 +49,96 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="447" x2="555" y1="235.7422" y2="235.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="452" y="249.9526">t.get_bitterness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="334"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="334"/>
       <ellipse cx="65.75" cy="350" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M68.7188,355.6406 Q68.1406,355.9375 67.5,356.0781 Q66.8594,356.2344 66.1563,356.2344 Q63.6563,356.2344 62.3281,354.5938 Q61.0156,352.9375 61.0156,349.8125 Q61.0156,346.6875 62.3281,345.0313 Q63.6563,343.375 66.1563,343.375 Q66.8594,343.375 67.5,343.5313 Q68.1563,343.6875 68.7188,343.9844 L68.7188,346.7031 Q68.0938,346.125 67.5,345.8594 Q66.9063,345.5781 66.2813,345.5781 Q64.9375,345.5781 64.25,346.6563 Q63.5625,347.7188 63.5625,349.8125 Q63.5625,351.9063 64.25,352.9844 Q64.9375,354.0469 66.2813,354.0469 Q66.9063,354.0469 67.5,353.7813 Q68.0938,353.5 68.7188,352.9219 L68.7188,355.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="68" x="86.25" y="354.1543">gala_apple</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="366" y2="366"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="372"/>
       <ellipse cx="17" cy="377" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L20" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L20" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="380.2104">get_name() const : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="384.8047"/>
       <ellipse cx="17" cy="389.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L21" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L21" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="26" y="393.0151">get_sweetness() const : float</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="201" y1="399.6094" y2="399.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="334"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="334"/>
       <ellipse cx="1043.75" cy="350" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1046.7188,355.6406 Q1046.1406,355.9375 1045.5,356.0781 Q1044.8594,356.2344 1044.1563,356.2344 Q1041.6563,356.2344 1040.3281,354.5938 Q1039.0156,352.9375 1039.0156,349.8125 Q1039.0156,346.6875 1040.3281,345.0313 Q1041.6563,343.375 1044.1563,343.375 Q1044.8594,343.375 1045.5,343.5313 Q1046.1563,343.6875 1046.7188,343.9844 L1046.7188,346.7031 Q1046.0938,346.125 1045.5,345.8594 Q1044.9063,345.5781 1044.2813,345.5781 Q1042.9375,345.5781 1042.25,346.6563 Q1041.5625,347.7188 1041.5625,349.8125 Q1041.5625,351.9063 1042.25,352.9844 Q1042.9375,354.0469 1044.2813,354.0469 Q1044.9063,354.0469 1045.5,353.7813 Q1046.0938,353.5 1046.7188,352.9219 L1046.7188,355.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="1064.25" y="354.1543">empire_apple</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="366" y2="366"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="372"/>
       <ellipse cx="1003" cy="377" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L26" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L26" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="1012" y="380.2104">get_name() const : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="998" y="384.8047"/>
       <ellipse cx="1003" cy="389.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L27" target="_top" title="get_sweetness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L27" xlink:show="new" xlink:title="get_sweetness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="1012" y="393.0151">get_sweetness() const : float</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="993" x2="1187" y1="399.6094" y2="399.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="334"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="334"/>
       <ellipse cx="816.75" cy="350" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M819.7188,355.6406 Q819.1406,355.9375 818.5,356.0781 Q817.8594,356.2344 817.1563,356.2344 Q814.6563,356.2344 813.3281,354.5938 Q812.0156,352.9375 812.0156,349.8125 Q812.0156,346.6875 813.3281,345.0313 Q814.6563,343.375 817.1563,343.375 Q817.8594,343.375 818.5,343.5313 Q819.1563,343.6875 819.7188,343.9844 L819.7188,346.7031 Q819.0938,346.125 818.5,345.8594 Q817.9063,345.5781 817.2813,345.5781 Q815.9375,345.5781 815.25,346.6563 Q814.5625,347.7188 814.5625,349.8125 Q814.5625,351.9063 815.25,352.9844 Q815.9375,354.0469 817.2813,354.0469 Q817.9063,354.0469 818.5,353.7813 Q819.0938,353.5 819.7188,352.9219 L819.7188,355.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="837.25" y="354.1543">lima_orange</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="366" y2="366"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="372"/>
       <ellipse cx="772" cy="377" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L33" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L33" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="781" y="380.2104">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="767" y="384.8047"/>
       <ellipse cx="772" cy="389.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L32" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L32" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="781" y="393.0151">get_name() const : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="762" x2="956" y1="399.6094" y2="399.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="334"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="334"/>
       <ellipse cx="279.9" cy="350" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M282.8688,355.6406 Q282.2906,355.9375 281.65,356.0781 Q281.0094,356.2344 280.3063,356.2344 Q277.8063,356.2344 276.4781,354.5938 Q275.1656,352.9375 275.1656,349.8125 Q275.1656,346.6875 276.4781,345.0313 Q277.8063,343.375 280.3063,343.375 Q281.0094,343.375 281.65,343.5313 Q282.3063,343.6875 282.8688,343.9844 L282.8688,346.7031 Q282.2438,346.125 281.65,345.8594 Q281.0563,345.5781 280.4313,345.5781 Q279.0875,345.5781 278.4,346.6563 Q277.7125,347.7188 277.7125,349.8125 Q277.7125,351.9063 278.4,352.9844 Q279.0875,354.0469 280.4313,354.0469 Q281.0563,354.0469 281.65,353.7813 Q282.2438,353.5 282.8688,352.9219 L282.8688,355.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="300.1" y="354.1543">valencia_orange</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="366" y2="366"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="372"/>
       <ellipse cx="248" cy="377" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L39" target="_top" title="get_bitterness" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L39" xlink:show="new" xlink:title="get_bitterness" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="257" y="380.2104">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="243" y="384.8047"/>
       <ellipse cx="248" cy="389.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L38" target="_top" title="get_name" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L38" xlink:show="new" xlink:title="get_name" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="257" y="393.0151">get_name() const : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="238" x2="432" y1="399.6094" y2="399.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="334"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="334"/>
       <ellipse cx="483" cy="350" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M485.9688,355.6406 Q485.3906,355.9375 484.75,356.0781 Q484.1094,356.2344 483.4063,356.2344 Q480.9063,356.2344 479.5781,354.5938 Q478.2656,352.9375 478.2656,349.8125 Q478.2656,346.6875 479.5781,345.0313 Q480.9063,343.375 483.4063,343.375 Q484.1094,343.375 484.75,343.5313 Q485.4063,343.6875 485.9688,343.9844 L485.9688,346.7031 Q485.3438,346.125 484.75,345.8594 Q484.1563,345.5781 483.5313,345.5781 Q482.1875,345.5781 481.5,346.6563 Q480.8125,347.7188 480.8125,349.8125 Q480.8125,351.9063 481.5,352.9844 Q482.1875,354.0469 483.5313,354.0469 Q484.1563,354.0469 484.75,353.7813 Q485.3438,353.5 485.9688,352.9219 L485.9688,355.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="497" y="354.1543">fruit_factory</text>
@@ -146,23 +146,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="580" y="343.1387">apple_c TA,orange_c TO</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="366" y2="366"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="372"/>
       <ellipse cx="479" cy="377" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L44" target="_top" title="create_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L44" xlink:show="new" xlink:title="create_apple" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="142" x="488" y="380.2104">create_apple() const : TA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="474" y="384.8047"/>
       <ellipse cx="479" cy="389.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L45" target="_top" title="create_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L45" xlink:show="new" xlink:title="create_orange" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="488" y="393.0151">create_orange() const : TO</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="469" x2="725" y1="399.6094" y2="399.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="273" y="469"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="273" y="469"/>
       <ellipse cx="288" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M290.9688,490.6406 Q290.3906,490.9375 289.75,491.0781 Q289.1094,491.2344 288.4063,491.2344 Q285.9063,491.2344 284.5781,489.5938 Q283.2656,487.9375 283.2656,484.8125 Q283.2656,481.6875 284.5781,480.0313 Q285.9063,478.375 288.4063,478.375 Q289.1094,478.375 289.75,478.5313 Q290.4063,478.6875 290.9688,478.9844 L290.9688,481.7031 Q290.3438,481.125 289.75,480.8594 Q289.1563,480.5781 288.5313,480.5781 Q287.1875,480.5781 286.5,481.6563 Q285.8125,482.7188 285.8125,484.8125 Q285.8125,486.9063 286.5,487.9844 Q287.1875,489.0469 288.5313,489.0469 Q289.1563,489.0469 289.75,488.7813 Q290.3438,488.5 290.9688,487.9219 L290.9688,490.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="302" y="489.1543">fruit_factory</text>
@@ -171,8 +171,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="274" x2="556" y1="501" y2="501"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="274" x2="556" y1="509" y2="509"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="679" y="469"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="679" y="469"/>
       <ellipse cx="694" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M696.9688,490.6406 Q696.3906,490.9375 695.75,491.0781 Q695.1094,491.2344 694.4063,491.2344 Q691.9063,491.2344 690.5781,489.5938 Q689.2656,487.9375 689.2656,484.8125 Q689.2656,481.6875 690.5781,480.0313 Q691.9063,478.375 694.4063,478.375 Q695.1094,478.375 695.75,478.5313 Q696.4063,478.6875 696.9688,478.9844 L696.9688,481.7031 Q696.3438,481.125 695.75,480.8594 Q695.1563,480.5781 694.5313,480.5781 Q693.1875,480.5781 692.5,481.6563 Q691.8125,482.7188 691.8125,484.8125 Q691.8125,486.9063 692.5,487.9844 Q693.1875,489.0469 694.5313,489.0469 Q695.1563,489.0469 695.75,488.7813 Q696.3438,488.5 696.9688,487.9219 L696.9688,490.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="708" y="489.1543">fruit_factory</text>
@@ -181,26 +181,26 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680" x2="952" y1="501" y2="501"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680" x2="952" y1="509" y2="509"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgfk7yesld6p)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="485.5" y="594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkftnndj1cf67)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="485.5" y="594"/>
       <ellipse cx="562.75" cy="610" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M565.7188,615.6406 Q565.1406,615.9375 564.5,616.0781 Q563.8594,616.2344 563.1563,616.2344 Q560.6563,616.2344 559.3281,614.5938 Q558.0156,612.9375 558.0156,609.8125 Q558.0156,606.6875 559.3281,605.0313 Q560.6563,603.375 563.1563,603.375 Q563.8594,603.375 564.5,603.5313 Q565.1563,603.6875 565.7188,603.9844 L565.7188,606.7031 Q565.0938,606.125 564.5,605.8594 Q563.9063,605.5781 563.2813,605.5781 Q561.9375,605.5781 561.25,606.6563 Q560.5625,607.7188 560.5625,609.8125 Q560.5625,611.9063 561.25,612.9844 Q561.9375,614.0469 563.2813,614.0469 Q563.9063,614.0469 564.5,613.7813 Q565.0938,613.5 565.7188,612.9219 L565.7188,615.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="583.25" y="614.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="655.5" y1="626" y2="626"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="655.5" y1="634" y2="634"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="491.5" y="640"/>
       <ellipse cx="496.5" cy="645" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="505.5" y="648.2104">factory_1 : fruit_factory_1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="491.5" y="652.8047"/>
       <ellipse cx="496.5" cy="657.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="505.5" y="661.0151">factory_2 : fruit_factory_2</text>
     </a>
     <path d="M596.91,104.85 C607.56,128.01 620.03,155.14 629.98,176.8 " fill="none" id="C_0001926201868069460340&lt;-C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg
index 2df07a6f..511bb49b 100644
--- a/docs/test_cases/t00059_class_mermaid.svg
+++ b/docs/test_cases/t00059_class_mermaid.svg
@@ -50,10 +50,10 @@
     <g class="root">
       <g class="clusters"/>
       <g class="edgePaths">
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M936.1328125,576L936.1328125,581.6666666666666C936.1328125,587.3333333333334,936.1328125,598.6666666666666,943.00390625,611.6682393630905C949.875,624.6698120595145,963.6171875,639.3396241190289,970.48828125,646.6745301487862L977.359375,654.0094361785434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1135.6640625,576L1135.6640625,581.6666666666666C1135.6640625,587.3333333333334,1135.6640625,598.6666666666666,1128.79296875,611.6682393630905C1121.921875,624.6698120595145,1108.1796875,639.3396241190289,1101.30859375,646.6745301487862L1094.4375,654.0094361785434"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M976.2751941568048,385L969.584797214004,390.6666666666667C962.8944002712033,396.3333333333333,949.5136063856016,407.6666666666667,942.8232094428008,419C936.1328125,430.3333333333333,936.1328125,441.6666666666667,936.1328125,447.3333333333333L936.1328125,453"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1095.5216808431953,385L1102.2120777859961,390.6666666666667C1108.902474728797,396.3333333333333,1122.2832686143984,407.6666666666667,1128.9736655571992,419C1135.6640625,430.3333333333333,1135.6640625,441.6666666666667,1135.6640625,447.3333333333333L1135.6640625,453"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M938.97265625,576L938.97265625,581.6666666666666C938.97265625,587.3333333333334,938.97265625,598.6666666666666,945.8444010416666,611.8838612823923C952.7161458333334,625.1010558981179,966.4596354166666,640.2021117962358,973.3313802083334,647.7526397452948L980.203125,655.3031676943538"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M1132.82421875,576L1132.82421875,581.6666666666666C1132.82421875,587.3333333333334,1132.82421875,598.6666666666666,1125.9524739583333,611.8838612823923C1119.0807291666667,625.1010558981179,1105.3372395833333,640.2021117962358,1098.4654947916667,647.7526397452948L1091.59375,655.3031676943538"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M977.9723788831361,385L971.4724251109468,390.6666666666667C964.9724713387574,396.3333333333333,951.9725637943787,407.6666666666667,945.4726100221893,419C938.97265625,430.3333333333333,938.97265625,441.6666666666667,938.97265625,447.3333333333333L938.97265625,453"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id4" d="M1093.8244961168639,385L1100.3244498890533,390.6666666666667C1106.8244036612425,396.3333333333333,1119.8243112056214,407.6666666666667,1126.3242649778106,419C1132.82421875,430.3333333333333,1132.82421875,441.6666666666667,1132.82421875,447.3333333333333L1132.82421875,453"/>
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M263.9372079439253,234L241.31746495327107,238.16666666666666C218.69772196261684,242.33333333333334,173.45823598130843,250.66666666666666,150.8384929906542,259C128.21875,267.3333333333333,128.21875,275.6666666666667,128.21875,279.8333333333333L128.21875,284"/>
         <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M418.65625,234L418.65625,238.16666666666666C418.65625,242.33333333333334,418.65625,250.66666666666666,418.65625,259C418.65625,267.3333333333333,418.65625,275.6666666666667,418.65625,279.8333333333333L418.65625,284"/>
         <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M588.453125,227.38329726169192L629.33984375,232.6527477180766C670.2265625,237.9221981744613,752,248.46109908723065,804.0415200745033,257.897216210282C856.0830401490066,267.3333333333333,878.3926427980132,275.6666666666667,889.5474441225165,279.8333333333333L900.7022454470199,284"/>
@@ -64,7 +64,7 @@
         <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M713.21875,76.83800625631011L774.81640625,87.86500521359176C836.4140625,98.8920041708734,959.609375,120.9460020854367,1021.20703125,137.639667709385C1082.8046875,154.33333333333334,1082.8046875,165.66666666666666,1082.8046875,171.33333333333334L1082.8046875,177"/>
       </g>
       <g class="edgeLabels">
-        <g transform="translate(936.1328125, 610)" class="edgeLabel">
+        <g transform="translate(938.97265625, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -75,7 +75,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1135.6640625, 610)" class="edgeLabel">
+        <g transform="translate(1132.82421875, 610)" class="edgeLabel">
           <g transform="translate(-4.890625, -9)" class="label">
             <foreignObject height="18" width="9.78125">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -86,7 +86,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(936.1328125, 419)" class="edgeLabel">
+        <g transform="translate(938.97265625, 419)" class="edgeLabel">
           <g transform="translate(-9.6328125, -9)" class="label">
             <foreignObject height="18" width="19.265625">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -97,7 +97,7 @@
             </foreignObject>
           </g>
         </g>
-        <g transform="translate(1135.6640625, 419)" class="edgeLabel">
+        <g transform="translate(1132.82421875, 419)" class="edgeLabel">
           <g transform="translate(-10.96875, -9)" class="label">
             <foreignObject height="18" width="21.9375">
               <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -198,11 +198,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(1035.8984375, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L7">
+        <a transform="translate(1035.8984375, 716.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L7">
           <g title="fruit_c" id="classId-C_0001926201868069460340-0" class="node default clickable">
-            <rect height="145" width="117.078125" y="-72.5" x="-58.5390625" class="outer title-state"/>
-            <line y2="-20.5" y1="-20.5" x2="58.5390625" x1="-58.5390625" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="58.5390625" x1="-58.5390625" class="divider"/>
+            <rect height="145" width="111.390625" y="-72.5" x="-55.6953125" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="55.6953125" x1="-55.6953125" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="55.6953125" x1="-55.6953125" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -65)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -214,29 +214,29 @@
                   <span class="nodeLabel">fruit_c&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -51.0390625, -9)" height="18" width="31.828125">
+              <foreignObject transform="translate( -48.1953125, -9)" height="18" width="31.828125">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"T{}"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -51.0390625, 13)" height="18" width="102.078125">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"t.get_name()"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -51.0390625, 47)" height="18" width="40.390625">
+              <foreignObject transform="translate( -48.1953125, 25)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -48.1953125, 47)" height="18" width="96.390625">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"t.get_name()</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(936.1328125, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L13">
+        <a transform="translate(938.97265625, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L13">
           <g title="apple_c" id="classId-C_0001932582371736186409-1" class="node default clickable">
-            <rect height="123" width="152.640625" y="-61.5" x="-76.3203125" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="76.3203125" x1="-76.3203125" class="divider"/>
-            <line y2="28.5" y1="28.5" x2="76.3203125" x1="-76.3203125" class="divider"/>
+            <rect height="123" width="146.96875" y="-61.5" x="-73.484375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="73.484375" x1="-73.484375" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="73.484375" x1="-73.484375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -54)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -248,24 +248,24 @@
                   <span class="nodeLabel">apple_c&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -68.8203125, 2)" height="18" width="137.640625">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"t.get_sweetness()"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -68.8203125, 36)" height="18" width="40.390625">
+              <foreignObject transform="translate( -65.984375, 14)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -65.984375, 36)" height="18" width="131.96875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"t.get_sweetness()</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(1135.6640625, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L16">
+        <a transform="translate(1132.82421875, 514.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L16">
           <g title="orange_c" id="classId-C_0001483904441065806133-2" class="node default clickable">
-            <rect height="123" width="146.421875" y="-61.5" x="-73.2109375" class="outer title-state"/>
-            <line y2="-9.5" y1="-9.5" x2="73.2109375" x1="-73.2109375" class="divider"/>
-            <line y2="28.5" y1="28.5" x2="73.2109375" x1="-73.2109375" class="divider"/>
+            <rect height="123" width="140.734375" y="-61.5" x="-70.3671875" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="70.3671875" x1="-70.3671875" class="divider"/>
+            <line y2="6.5" y1="6.5" x2="70.3671875" x1="-70.3671875" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -54)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -277,20 +277,20 @@
                   <span class="nodeLabel">orange_c&lt;T&gt;</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -65.7109375, 2)" height="18" width="131.421875">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"t.get_bitterness()"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -65.7109375, 36)" height="18" width="40.390625">
+              <foreignObject transform="translate( -62.8671875, 14)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -62.8671875, 36)" height="18" width="125.734375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"t.get_bitterness()</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(128.21875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L18">
+        <a transform="translate(128.21875, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L18">
           <g title="gala_apple" id="classId-C_0000399997161214328320-3" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -319,7 +319,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(709.09375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L24">
+        <a transform="translate(709.09375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L24">
           <g title="empire_apple" id="classId-C_0000660406972347773654-4" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -348,7 +348,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1362.703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L30">
+        <a transform="translate(1362.703125, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L30">
           <g title="lima_orange" id="classId-C_0001649295452510454080-5" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -377,7 +377,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(418.65625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L36">
+        <a transform="translate(418.65625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L36">
           <g title="valencia_orange" id="classId-C_0000802727760415733923-6" class="node default clickable">
             <rect height="101" width="240.4375" y="-50.5" x="-120.21875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="120.21875" x1="-120.21875" class="divider"/>
@@ -406,7 +406,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1035.8984375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1035.8984375, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0002301786483822933456-7" class="node default clickable">
             <rect height="101" width="313.171875" y="-50.5" x="-156.5859375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="156.5859375" x1="-156.5859375" class="divider"/>
@@ -435,7 +435,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(418.65625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42">
+        <a transform="translate(418.65625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000551278102444647278-8" class="node default clickable">
             <rect height="57" width="339.59375" y="-28.5" x="-169.796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="169.796875" x1="-169.796875" class="divider"/>
@@ -454,7 +454,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1082.8046875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L42">
+        <a transform="translate(1082.8046875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L42">
           <g title="fruit_factory" id="classId-C_0000536390279563541226-9" class="node default clickable">
             <rect height="57" width="328.90625" y="-28.5" x="-164.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="164.453125" x1="-164.453125" class="divider"/>
@@ -473,7 +473,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(610.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00059/t00059.cc#L51">
+        <a transform="translate(610.78125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00059/t00059.cc#L51">
           <g title="R" id="classId-C_0001128300671453354325-10" class="node default clickable">
             <rect height="101" width="204.875" y="-50.5" x="-102.4375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="102.4375" x1="-102.4375" class="divider"/>
diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg
index 5e8ec5a2..4c5394d4 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="f1u9arpdej7bzf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fjdvhqm040d5f" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u9arpdej7bzf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjdvhqm040d5f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u9arpdej7bzf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjdvhqm040d5f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u9arpdej7bzf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjdvhqm040d5f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u9arpdej7bzf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjdvhqm040d5f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u9arpdej7bzf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjdvhqm040d5f)" 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>
@@ -51,15 +51,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="54"/>
       <ellipse cx="147" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="62.2104">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u9arpdej7bzf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjdvhqm040d5f)" 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>
@@ -68,18 +68,18 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="192"/>
       <ellipse cx="172.5" cy="197" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="200.2104">h : G&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="204.8047"/>
       <ellipse cx="172.5" cy="209.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="213.0151">hh : P</text>
     </a>
     <path d="M64.83,81.38 C55.08,106.65 43.02,137.89 34.96,158.8 " fill="none" id="C_0001373615549846303472&lt;-C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg
index bff4f4e1..ec266059 100644
--- a/docs/test_cases/t00060_class_mermaid.svg
+++ b/docs/test_cases/t00060_class_mermaid.svg
@@ -116,7 +116,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L3">
+        <a transform="translate(59.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L3">
           <g title="A" id="classId-C_0001373615549846303472-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -135,7 +135,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L4">
+        <a transform="translate(21.28125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L4">
           <g title="B" id="classId-C_0000479650368930934571-1" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L5">
+        <a transform="translate(97.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L5">
           <g title="C" id="classId-C_0001827660844127264787-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -173,7 +173,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L6">
+        <a transform="translate(59.5625, 334.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L6">
           <g title="D" id="classId-C_0001629687372290281981-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -192,7 +192,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L10">
+        <a transform="translate(204.8671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L10">
           <g title="G" id="classId-C_0001877304825033069517-4" class="node default clickable">
             <rect height="79" width="56.0625" y="-39.5" x="-28.03125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -216,7 +216,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00060/t00060.cc#L14">
+        <a transform="translate(204.8671875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00060/t00060.cc#L14">
           <g title="H" id="classId-C_0001881610349123495638-5" class="node default clickable">
             <rect height="101" width="87.484375" y="-50.5" x="-43.7421875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="43.7421875" x1="-43.7421875" class="divider"/>
diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg
index fa2ea2d1..b3ad5143 100644
--- a/docs/test_cases/t00061_class.svg
+++ b/docs/test_cases/t00061_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="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhw5nes5fwtfr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fxrnf0gz28ud7" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhw5nes5fwtfr)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00061/include/t00061_a.h#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00061/include/t00061_a.h#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxrnf0gz28ud7)" height="48" id="C_0001010204727957329423" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
       <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
diff --git a/docs/test_cases/t00061_class_mermaid.svg b/docs/test_cases/t00061_class_mermaid.svg
index a5d7765c..7c525d0f 100644
--- a/docs/test_cases/t00061_class_mermaid.svg
+++ b/docs/test_cases/t00061_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00061/include/t00061_a.h#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00061/include/t00061_a.h#L3">
           <g title="A" id="classId-C_0001010204727957329423-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg
index c2249cb4..4fc8840b 100644
--- a/docs/test_cases/t00062_class.svg
+++ b/docs/test_cases/t00062_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="1285px" preserveAspectRatio="none" style="width:1087px;height:1285px;" version="1.1" viewBox="0 0 1087 1285" width="1087px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fdwezl440h6yo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwsdhygny579i" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0001046827200300090710" style="stroke: #A80036; stroke-width: 1.5;" width="67" x="813" y="1214"/>
       <ellipse cx="828.45" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M831.4188,1235.6406 Q830.8406,1235.9375 830.2,1236.0781 Q829.5594,1236.2344 828.8563,1236.2344 Q826.3563,1236.2344 825.0281,1234.5938 Q823.7156,1232.9375 823.7156,1229.8125 Q823.7156,1226.6875 825.0281,1225.0313 Q826.3563,1223.375 828.8563,1223.375 Q829.5594,1223.375 830.2,1223.5313 Q830.8563,1223.6875 831.4188,1223.9844 L831.4188,1226.7031 Q830.7938,1226.125 830.2,1225.8594 Q829.6063,1225.5781 828.9813,1225.5781 Q827.6375,1225.5781 826.95,1226.6563 Q826.2625,1227.7188 826.2625,1229.8125 Q826.2625,1231.9063 826.95,1232.9844 Q827.6375,1234.0469 828.9813,1234.0469 Q829.6063,1234.0469 830.2,1233.7813 Q830.7938,1233.5 831.4188,1232.9219 L831.4188,1235.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="842.55" y="1234.1543">A</text>
@@ -19,15 +19,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1246" y2="1246"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="814" x2="879" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="819" y="1260"/>
       <ellipse cx="824" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L10" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L10" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="833" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0001099548178945911245" style="stroke: #A80036; stroke-width: 1.5;" width="206" x="465" y="1214"/>
       <ellipse cx="480" cy="1230" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M482.9688,1235.6406 Q482.3906,1235.9375 481.75,1236.0781 Q481.1094,1236.2344 480.4063,1236.2344 Q477.9063,1236.2344 476.5781,1234.5938 Q475.2656,1232.9375 475.2656,1229.8125 Q475.2656,1226.6875 476.5781,1225.0313 Q477.9063,1223.375 480.4063,1223.375 Q481.1094,1223.375 481.75,1223.5313 Q482.4063,1223.6875 482.9688,1223.9844 L482.9688,1226.7031 Q482.3438,1226.125 481.75,1225.8594 Q481.1563,1225.5781 480.5313,1225.5781 Q479.1875,1225.5781 478.5,1226.6563 Q477.8125,1227.7188 477.8125,1229.8125 Q477.8125,1231.9063 478.5,1232.9844 Q479.1875,1234.0469 480.5313,1234.0469 Q481.1563,1234.0469 481.75,1233.7813 Q482.3438,1233.5 482.9688,1232.9219 L482.9688,1235.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494" y="1234.1543">A</text>
@@ -36,15 +36,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1246" y2="1246"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="466" x2="670" y1="1254" y2="1254"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="471" y="1260"/>
       <ellipse cx="476" cy="1265" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L14" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L14" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="485" y="1268.2104">u : U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L18" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L18" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="48" id="C_0001239388209995793547" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="1220.5"/>
       <ellipse cx="21" cy="1236.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,1242.1406 Q23.3906,1242.4375 22.75,1242.5781 Q22.1094,1242.7344 21.4063,1242.7344 Q18.9063,1242.7344 17.5781,1241.0938 Q16.2656,1239.4375 16.2656,1236.3125 Q16.2656,1233.1875 17.5781,1231.5313 Q18.9063,1229.875 21.4063,1229.875 Q22.1094,1229.875 22.75,1230.0313 Q23.4063,1230.1875 23.9688,1230.4844 L23.9688,1233.2031 Q23.3438,1232.625 22.75,1232.3594 Q22.1563,1232.0781 21.5313,1232.0781 Q20.1875,1232.0781 19.5,1233.1563 Q18.8125,1234.2188 18.8125,1236.3125 Q18.8125,1238.4063 19.5,1239.4844 Q20.1875,1240.5469 21.5313,1240.5469 Q22.1563,1240.5469 22.75,1240.2813 Q23.3438,1240 23.9688,1239.4219 L23.9688,1242.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="1240.6543">A</text>
@@ -53,8 +53,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1252.5" y2="1252.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="1260.5" y2="1260.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0000045701897814162098" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="810" y="8"/>
       <ellipse cx="825" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M827.9688,29.6406 Q827.3906,29.9375 826.75,30.0781 Q826.1094,30.2344 825.4063,30.2344 Q822.9063,30.2344 821.5781,28.5938 Q820.2656,26.9375 820.2656,23.8125 Q820.2656,20.6875 821.5781,19.0313 Q822.9063,17.375 825.4063,17.375 Q826.1094,17.375 826.75,17.5313 Q827.4063,17.6875 827.9688,17.9844 L827.9688,20.7031 Q827.3438,20.125 826.75,19.8594 Q826.1563,19.5781 825.5313,19.5781 Q824.1875,19.5781 823.5,20.6563 Q822.8125,21.7188 822.8125,23.8125 Q822.8125,25.9063 823.5,26.9844 Q824.1875,28.0469 825.5313,28.0469 Q826.1563,28.0469 826.75,27.7813 Q827.3438,27.5 827.9688,26.9219 L827.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="839" y="28.1543">A</text>
@@ -63,15 +63,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="811" x2="882" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="816" y="54"/>
       <ellipse cx="821" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L21" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L21" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="830" y="62.2104">u : U **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0001379193770802992785" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="509.5" y="8"/>
       <ellipse cx="524.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.4688,29.6406 Q526.8906,29.9375 526.25,30.0781 Q525.6094,30.2344 524.9063,30.2344 Q522.4063,30.2344 521.0781,28.5938 Q519.7656,26.9375 519.7656,23.8125 Q519.7656,20.6875 521.0781,19.0313 Q522.4063,17.375 524.9063,17.375 Q525.6094,17.375 526.25,17.5313 Q526.9063,17.6875 527.4688,17.9844 L527.4688,20.7031 Q526.8438,20.125 526.25,19.8594 Q525.6563,19.5781 525.0313,19.5781 Q523.6875,19.5781 523,20.6563 Q522.3125,21.7188 522.3125,23.8125 Q522.3125,25.9063 523,26.9844 Q523.6875,28.0469 525.0313,28.0469 Q525.6563,28.0469 526.25,27.7813 Q526.8438,27.5 527.4688,26.9219 L527.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="538.5" y="28.1543">A</text>
@@ -80,15 +80,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="625.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="515.5" y="54"/>
       <ellipse cx="520.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L25" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L25" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="529.5" y="62.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L28" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L28" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0001407865337446777280" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="731" y="104"/>
       <ellipse cx="746" cy="120" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M748.9688,125.6406 Q748.3906,125.9375 747.75,126.0781 Q747.1094,126.2344 746.4063,126.2344 Q743.9063,126.2344 742.5781,124.5938 Q741.2656,122.9375 741.2656,119.8125 Q741.2656,116.6875 742.5781,115.0313 Q743.9063,113.375 746.4063,113.375 Q747.1094,113.375 747.75,113.5313 Q748.4063,113.6875 748.9688,113.9844 L748.9688,116.7031 Q748.3438,116.125 747.75,115.8594 Q747.1563,115.5781 746.5313,115.5781 Q745.1875,115.5781 744.5,116.6563 Q743.8125,117.7188 743.8125,119.8125 Q743.8125,121.9063 744.5,122.9844 Q745.1875,124.0469 746.5313,124.0469 Q747.1563,124.0469 747.75,123.7813 Q748.3438,123.5 748.9688,122.9219 L748.9688,125.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="760" y="124.1543">A</text>
@@ -97,15 +97,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="136" y2="136"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="732" x2="961" y1="144" y2="144"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="737" y="150"/>
       <ellipse cx="742" cy="155" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L29" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L29" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="751" y="158.2104">u : U ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L32" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L32" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0001034483227649400416" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="808" y="200"/>
       <ellipse cx="823.9" cy="216" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.8688,221.6406 Q826.2906,221.9375 825.65,222.0781 Q825.0094,222.2344 824.3063,222.2344 Q821.8063,222.2344 820.4781,220.5938 Q819.1656,218.9375 819.1656,215.8125 Q819.1656,212.6875 820.4781,211.0313 Q821.8063,209.375 824.3063,209.375 Q825.0094,209.375 825.65,209.5313 Q826.3063,209.6875 826.8688,209.9844 L826.8688,212.7031 Q826.2438,212.125 825.65,211.8594 Q825.0563,211.5781 824.4313,211.5781 Q823.0875,211.5781 822.4,212.6563 Q821.7125,213.7188 821.7125,215.8125 Q821.7125,217.9063 822.4,218.9844 Q823.0875,220.0469 824.4313,220.0469 Q825.0563,220.0469 825.65,219.7813 Q826.2438,219.5 826.8688,218.9219 L826.8688,221.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838.1" y="220.1543">A</text>
@@ -114,15 +114,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="232" y2="232"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="809" x2="884" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="814" y="246"/>
       <ellipse cx="819" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L33" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L33" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="828" y="254.2104">u : U &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L36" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L36" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0000352457857519671117" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="795.5" y="296"/>
       <ellipse cx="811.4" cy="312" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M814.3688,317.6406 Q813.7906,317.9375 813.15,318.0781 Q812.5094,318.2344 811.8063,318.2344 Q809.3063,318.2344 807.9781,316.5938 Q806.6656,314.9375 806.6656,311.8125 Q806.6656,308.6875 807.9781,307.0313 Q809.3063,305.375 811.8063,305.375 Q812.5094,305.375 813.15,305.5313 Q813.8063,305.6875 814.3688,305.9844 L814.3688,308.7031 Q813.7438,308.125 813.15,307.8594 Q812.5563,307.5781 811.9313,307.5781 Q810.5875,307.5781 809.9,308.6563 Q809.2125,309.7188 809.2125,311.8125 Q809.2125,313.9063 809.9,314.9844 Q810.5875,316.0469 811.9313,316.0469 Q812.5563,316.0469 813.15,315.7813 Q813.7438,315.5 814.3688,314.9219 L814.3688,317.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.6" y="316.1543">A</text>
@@ -131,15 +131,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="328" y2="328"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="896.5" y1="336" y2="336"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="342"/>
       <ellipse cx="806.5" cy="347" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L37" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L37" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="815.5" y="350.2104">u : const U &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="73.6094" id="C_0000314708288320430272" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="804.5" y="392.5"/>
       <ellipse cx="821.3" cy="408.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M824.2688,414.1406 Q823.6906,414.4375 823.05,414.5781 Q822.4094,414.7344 821.7063,414.7344 Q819.2063,414.7344 817.8781,413.0938 Q816.5656,411.4375 816.5656,408.3125 Q816.5656,405.1875 817.8781,403.5313 Q819.2063,401.875 821.7063,401.875 Q822.4094,401.875 823.05,402.0313 Q823.7063,402.1875 824.2688,402.4844 L824.2688,405.2031 Q823.6438,404.625 823.05,404.3594 Q822.4563,404.0781 821.8313,404.0781 Q820.4875,404.0781 819.8,405.1563 Q819.1125,406.2188 819.1125,408.3125 Q819.1125,410.4063 819.8,411.4844 Q820.4875,412.5469 821.8313,412.5469 Q822.4563,412.5469 823.05,412.2813 Q823.6438,412 824.2688,411.4219 L824.2688,414.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.7" y="412.6543">A</text>
@@ -148,22 +148,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="424.5" y2="424.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="805.5" x2="887.5" y1="432.5" y2="432.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="438.5"/>
       <ellipse cx="815.5" cy="443.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L41" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L41" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="824.5" y="446.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="810.5" y="451.3047"/>
       <ellipse cx="815.5" cy="456.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L42" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L42" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="824.5" y="459.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L45" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L45" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="73.6094" id="C_0000827753335392390402" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="517" y="149.5"/>
       <ellipse cx="532" cy="165.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M534.9688,171.1406 Q534.3906,171.4375 533.75,171.5781 Q533.1094,171.7344 532.4063,171.7344 Q529.9063,171.7344 528.5781,170.0938 Q527.2656,168.4375 527.2656,165.3125 Q527.2656,162.1875 528.5781,160.5313 Q529.9063,158.875 532.4063,158.875 Q533.1094,158.875 533.75,159.0313 Q534.4063,159.1875 534.9688,159.4844 L534.9688,162.2031 Q534.3438,161.625 533.75,161.3594 Q533.1563,161.0781 532.5313,161.0781 Q531.1875,161.0781 530.5,162.1563 Q529.8125,163.2188 529.8125,165.3125 Q529.8125,167.4063 530.5,168.4844 Q531.1875,169.5469 532.5313,169.5469 Q533.1563,169.5469 533.75,169.2813 Q534.3438,169 534.9688,168.4219 L534.9688,171.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="546" y="169.6543">A</text>
@@ -172,22 +172,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="181.5" y2="181.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="518" x2="618" y1="189.5" y2="189.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="195.5"/>
       <ellipse cx="528" cy="200.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L46" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L46" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="537" y="203.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="523" y="208.3047"/>
       <ellipse cx="528" cy="213.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L47" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L47" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="537" y="216.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="73.6094" id="C_0000395583480407686249" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="786" y="501.5"/>
       <ellipse cx="801" cy="517.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M803.9688,523.1406 Q803.3906,523.4375 802.75,523.5781 Q802.1094,523.7344 801.4063,523.7344 Q798.9063,523.7344 797.5781,522.0938 Q796.2656,520.4375 796.2656,517.3125 Q796.2656,514.1875 797.5781,512.5313 Q798.9063,510.875 801.4063,510.875 Q802.1094,510.875 802.75,511.0313 Q803.4063,511.1875 803.9688,511.4844 L803.9688,514.2031 Q803.3438,513.625 802.75,513.3594 Q802.1563,513.0781 801.5313,513.0781 Q800.1875,513.0781 799.5,514.1563 Q798.8125,515.2188 798.8125,517.3125 Q798.8125,519.4063 799.5,520.4844 Q800.1875,521.5469 801.5313,521.5469 Q802.1563,521.5469 802.75,521.2813 Q803.3438,521 803.9688,520.4219 L803.9688,523.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="815" y="521.6543">A</text>
@@ -196,22 +196,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="533.5" y2="533.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="787" x2="906" y1="541.5" y2="541.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="547.5"/>
       <ellipse cx="797" cy="552.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L51" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L51" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="806" y="555.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="792" y="560.3047"/>
       <ellipse cx="797" cy="565.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L52" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L52" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="806" y="568.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L55" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L55" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0000476497055497873078" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="501.5" y="508"/>
       <ellipse cx="516.5" cy="524" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M519.4688,529.6406 Q518.8906,529.9375 518.25,530.0781 Q517.6094,530.2344 516.9063,530.2344 Q514.4063,530.2344 513.0781,528.5938 Q511.7656,526.9375 511.7656,523.8125 Q511.7656,520.6875 513.0781,519.0313 Q514.4063,517.375 516.9063,517.375 Q517.6094,517.375 518.25,517.5313 Q518.9063,517.6875 519.4688,517.9844 L519.4688,520.7031 Q518.8438,520.125 518.25,519.8594 Q517.6563,519.5781 517.0313,519.5781 Q515.6875,519.5781 515,520.6563 Q514.3125,521.7188 514.3125,523.8125 Q514.3125,525.9063 515,526.9844 Q515.6875,528.0469 517.0313,528.0469 Q517.6563,528.0469 518.25,527.7813 Q518.8438,527.5 519.4688,526.9219 L519.4688,529.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="530.5" y="528.1543">A</text>
@@ -220,15 +220,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="540" y2="540"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="502.5" x2="633.5" y1="548" y2="548"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="507.5" y="554"/>
       <ellipse cx="512.5" cy="559" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L56" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L56" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="521.5" y="562.2104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L59" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L59" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="73.6094" id="C_0001619634759668095904" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="496.5" y="258.5"/>
       <ellipse cx="511.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M514.4688,280.1406 Q513.8906,280.4375 513.25,280.5781 Q512.6094,280.7344 511.9063,280.7344 Q509.4063,280.7344 508.0781,279.0938 Q506.7656,277.4375 506.7656,274.3125 Q506.7656,271.1875 508.0781,269.5313 Q509.4063,267.875 511.9063,267.875 Q512.6094,267.875 513.25,268.0313 Q513.9063,268.1875 514.4688,268.4844 L514.4688,271.2031 Q513.8438,270.625 513.25,270.3594 Q512.6563,270.0781 512.0313,270.0781 Q510.6875,270.0781 510,271.1563 Q509.3125,272.2188 509.3125,274.3125 Q509.3125,276.4063 510,277.4844 Q510.6875,278.5469 512.0313,278.5469 Q512.6563,278.5469 513.25,278.2813 Q513.8438,278 514.4688,277.4219 L514.4688,280.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="525.5" y="278.6543">A</text>
@@ -237,22 +237,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="290.5" y2="290.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497.5" x2="638.5" y1="298.5" y2="298.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="304.5"/>
       <ellipse cx="507.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L60" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L60" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="516.5" y="312.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502.5" y="317.3047"/>
       <ellipse cx="507.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L61" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L61" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="516.5" y="325.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L64" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L64" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="73.6094" id="C_0001357746808315142717" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="127.5" y="258.5"/>
       <ellipse cx="142.5" cy="274.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.4688,280.1406 Q144.8906,280.4375 144.25,280.5781 Q143.6094,280.7344 142.9063,280.7344 Q140.4063,280.7344 139.0781,279.0938 Q137.7656,277.4375 137.7656,274.3125 Q137.7656,271.1875 139.0781,269.5313 Q140.4063,267.875 142.9063,267.875 Q143.6094,267.875 144.25,268.0313 Q144.9063,268.1875 145.4688,268.4844 L145.4688,271.2031 Q144.8438,270.625 144.25,270.3594 Q143.6563,270.0781 143.0313,270.0781 Q141.6875,270.0781 141,271.1563 Q140.3125,272.2188 140.3125,274.3125 Q140.3125,276.4063 141,277.4844 Q141.6875,278.5469 143.0313,278.5469 Q143.6563,278.5469 144.25,278.2813 Q144.8438,278 145.4688,277.4219 L145.4688,280.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.5" y="278.6543">A</text>
@@ -261,22 +261,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="290.5" y2="290.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="282.5" y1="298.5" y2="298.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="304.5"/>
       <ellipse cx="138.5" cy="309.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="147.5" y="312.7104">c : C &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="317.3047"/>
       <ellipse cx="138.5" cy="322.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L66" target="_top" title="mf" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L66" xlink:show="new" xlink:title="mf" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="147.5" y="325.5151">mf : float C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L70" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L70" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="73.6094" id="C_0000544335779197078982" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="749" y="610.5"/>
       <ellipse cx="764" cy="626.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M766.9688,632.1406 Q766.3906,632.4375 765.75,632.5781 Q765.1094,632.7344 764.4063,632.7344 Q761.9063,632.7344 760.5781,631.0938 Q759.2656,629.4375 759.2656,626.3125 Q759.2656,623.1875 760.5781,621.5313 Q761.9063,619.875 764.4063,619.875 Q765.1094,619.875 765.75,620.0313 Q766.4063,620.1875 766.9688,620.4844 L766.9688,623.2031 Q766.3438,622.625 765.75,622.3594 Q765.1563,622.0781 764.5313,622.0781 Q763.1875,622.0781 762.5,623.1563 Q761.8125,624.2188 761.8125,626.3125 Q761.8125,628.4063 762.5,629.4844 Q763.1875,630.5469 764.5313,630.5469 Q765.1563,630.5469 765.75,630.2813 Q766.3438,630 766.9688,629.4219 L766.9688,632.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="778" y="630.6543">A</text>
@@ -285,22 +285,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="642.5" y2="642.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750" x2="943" y1="650.5" y2="650.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="656.5"/>
       <ellipse cx="760" cy="661.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L71" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L71" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="769" y="664.7104">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="755" y="669.3047"/>
       <ellipse cx="760" cy="674.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L72" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L72" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="769" y="677.5151">m : M C::*</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L75" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L75" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0000602066980416477930" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="801" y="720"/>
       <ellipse cx="816" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M818.9688,741.6406 Q818.3906,741.9375 817.75,742.0781 Q817.1094,742.2344 816.4063,742.2344 Q813.9063,742.2344 812.5781,740.5938 Q811.2656,738.9375 811.2656,735.8125 Q811.2656,732.6875 812.5781,731.0313 Q813.9063,729.375 816.4063,729.375 Q817.1094,729.375 817.75,729.5313 Q818.4063,729.6875 818.9688,729.9844 L818.9688,732.7031 Q818.3438,732.125 817.75,731.8594 Q817.1563,731.5781 816.5313,731.5781 Q815.1875,731.5781 814.5,732.6563 Q813.8125,733.7188 813.8125,735.8125 Q813.8125,737.9063 814.5,738.9844 Q815.1875,740.0469 816.5313,740.0469 Q817.1563,740.0469 817.75,739.7813 Q818.3438,739.5 818.9688,738.9219 L818.9688,741.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="830" y="740.1543">A</text>
@@ -309,15 +309,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="752" y2="752"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="802" x2="891" y1="760" y2="760"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="807" y="766"/>
       <ellipse cx="812" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L76" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L76" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="821" y="774.2104">n : char[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L79" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L79" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0001318419672443856415" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="493.5" y="720"/>
       <ellipse cx="524.25" cy="736" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.2188,741.6406 Q526.6406,741.9375 526,742.0781 Q525.3594,742.2344 524.6563,742.2344 Q522.1563,742.2344 520.8281,740.5938 Q519.5156,738.9375 519.5156,735.8125 Q519.5156,732.6875 520.8281,731.0313 Q522.1563,729.375 524.6563,729.375 Q525.3594,729.375 526,729.5313 Q526.6563,729.6875 527.2188,729.9844 L527.2188,732.7031 Q526.5938,732.125 526,731.8594 Q525.4063,731.5781 524.7813,731.5781 Q523.4375,731.5781 522.75,732.6563 Q522.0625,733.7188 522.0625,735.8125 Q522.0625,737.9063 522.75,738.9844 Q523.4375,740.0469 524.7813,740.0469 Q525.4063,740.0469 526,739.7813 Q526.5938,739.5 527.2188,738.9219 L527.2188,741.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541.75" y="740.1543">A</text>
@@ -326,15 +326,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="752" y2="752"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="641.5" y1="760" y2="760"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="499.5" y="766"/>
       <ellipse cx="504.5" cy="771" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L80" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L80" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="513.5" y="774.2104">n : std::vector&lt;char&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L83" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0000599593856979463652" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="782" y="816"/>
       <ellipse cx="797.9" cy="832" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M800.8688,837.6406 Q800.2906,837.9375 799.65,838.0781 Q799.0094,838.2344 798.3063,838.2344 Q795.8063,838.2344 794.4781,836.5938 Q793.1656,834.9375 793.1656,831.8125 Q793.1656,828.6875 794.4781,827.0313 Q795.8063,825.375 798.3063,825.375 Q799.0094,825.375 799.65,825.5313 Q800.3063,825.6875 800.8688,825.9844 L800.8688,828.7031 Q800.2438,828.125 799.65,827.8594 Q799.0563,827.5781 798.4313,827.5781 Q797.0875,827.5781 796.4,828.6563 Q795.7125,829.7188 795.7125,831.8125 Q795.7125,833.9063 796.4,834.9844 Q797.0875,836.0469 798.4313,836.0469 Q799.0563,836.0469 799.65,835.7813 Q800.2438,835.5 800.8688,834.9219 L800.8688,837.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="812.1" y="836.1543">A</text>
@@ -343,15 +343,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="848" y2="848"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="783" x2="910" y1="856" y2="856"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="788" y="862"/>
       <ellipse cx="793" cy="867" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L83" target="_top" title="klm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L83" xlink:show="new" xlink:title="klm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="802" y="870.2104">klm : char[K][L][M]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L85" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L85" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0000015395295268000991" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="809" y="912"/>
       <ellipse cx="824" cy="928" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.9688,933.6406 Q826.3906,933.9375 825.75,934.0781 Q825.1094,934.2344 824.4063,934.2344 Q821.9063,934.2344 820.5781,932.5938 Q819.2656,930.9375 819.2656,927.8125 Q819.2656,924.6875 820.5781,923.0313 Q821.9063,921.375 824.4063,921.375 Q825.1094,921.375 825.75,921.5313 Q826.4063,921.6875 826.9688,921.9844 L826.9688,924.7031 Q826.3438,924.125 825.75,923.8594 Q825.1563,923.5781 824.5313,923.5781 Q823.1875,923.5781 822.5,924.6563 Q821.8125,925.7188 821.8125,927.8125 Q821.8125,929.9063 822.5,930.9844 Q823.1875,932.0469 824.5313,932.0469 Q825.1563,932.0469 825.75,931.7813 Q826.3438,931.5 826.9688,930.9219 L826.9688,933.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="838" y="932.1543">A</text>
@@ -360,15 +360,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="944" y2="944"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="810" x2="883" y1="952" y2="952"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="815" y="958"/>
       <ellipse cx="820" cy="963" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L86" target="_top" title="u" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L86" xlink:show="new" xlink:title="u" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="43" x="829" y="966.2104">u : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L89" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L89" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="60.8047" id="C_0001603321863498552207" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="807" y="1008"/>
       <ellipse cx="822" cy="1024" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M824.9688,1029.6406 Q824.3906,1029.9375 823.75,1030.0781 Q823.1094,1030.2344 822.4063,1030.2344 Q819.9063,1030.2344 818.5781,1028.5938 Q817.2656,1026.9375 817.2656,1023.8125 Q817.2656,1020.6875 818.5781,1019.0313 Q819.9063,1017.375 822.4063,1017.375 Q823.1094,1017.375 823.75,1017.5313 Q824.4063,1017.6875 824.9688,1017.9844 L824.9688,1020.7031 Q824.3438,1020.125 823.75,1019.8594 Q823.1563,1019.5781 822.5313,1019.5781 Q821.1875,1019.5781 820.5,1020.6563 Q819.8125,1021.7188 819.8125,1023.8125 Q819.8125,1025.9063 820.5,1026.9844 Q821.1875,1028.0469 822.5313,1028.0469 Q823.1563,1028.0469 823.75,1027.7813 Q824.3438,1027.5 824.9688,1026.9219 L824.9688,1029.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="836" y="1028.1543">A</text>
@@ -377,15 +377,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1040" y2="1040"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="885" y1="1048" y2="1048"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="813" y="1054"/>
       <ellipse cx="818" cy="1059" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L90" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L90" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="827" y="1062.2104">c : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L95" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L95" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="73.6094" id="C_0000232518961342221670" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="759.5" y="1104.5"/>
       <ellipse cx="797.9" cy="1120.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M800.8688,1126.1406 Q800.2906,1126.4375 799.65,1126.5781 Q799.0094,1126.7344 798.3063,1126.7344 Q795.8063,1126.7344 794.4781,1125.0938 Q793.1656,1123.4375 793.1656,1120.3125 Q793.1656,1117.1875 794.4781,1115.5313 Q795.8063,1113.875 798.3063,1113.875 Q799.0094,1113.875 799.65,1114.0313 Q800.3063,1114.1875 800.8688,1114.4844 L800.8688,1117.2031 Q800.2438,1116.625 799.65,1116.3594 Q799.0563,1116.0781 798.4313,1116.0781 Q797.0875,1116.0781 796.4,1117.1563 Q795.7125,1118.2188 795.7125,1120.3125 Q795.7125,1122.4063 796.4,1123.4844 Q797.0875,1124.5469 798.4313,1124.5469 Q799.0563,1124.5469 799.65,1124.2813 Q800.2438,1124 800.8688,1123.4219 L800.8688,1126.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="817.1" y="1124.6543">A</text>
@@ -394,22 +394,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1136.5" y2="1136.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="932.5" y1="1144.5" y2="1144.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1150.5"/>
       <ellipse cx="770.5" cy="1155.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L97" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L97" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="779.5" y="1158.7104">args : std::tuple&lt;Args...&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="765.5" y="1163.3047"/>
       <ellipse cx="770.5" cy="1168.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L96" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L96" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="779.5" y="1171.5151">c : C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdwezl440h6yo)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdhygny579i)" height="48" id="C_0000121103565834936476" style="stroke: #A80036; stroke-width: 1.5;" width="51" x="1022" y="623.5"/>
       <ellipse cx="1037" cy="639.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1039.9688,645.1406 Q1039.3906,645.4375 1038.75,645.5781 Q1038.1094,645.7344 1037.4063,645.7344 Q1034.9063,645.7344 1033.5781,644.0938 Q1032.2656,642.4375 1032.2656,639.3125 Q1032.2656,636.1875 1033.5781,634.5313 Q1034.9063,632.875 1037.4063,632.875 Q1038.1094,632.875 1038.75,633.0313 Q1039.4063,633.1875 1039.9688,633.4844 L1039.9688,636.2031 Q1039.3438,635.625 1038.75,635.3594 Q1038.1563,635.0781 1037.5313,635.0781 Q1036.1875,635.0781 1035.5,636.1563 Q1034.8125,637.2188 1034.8125,639.3125 Q1034.8125,641.4063 1035.5,642.4844 Q1036.1875,643.5469 1037.5313,643.5469 Q1038.1563,643.5469 1038.75,643.2813 Q1039.3438,643 1039.9688,642.4219 L1039.9688,645.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1051" y="643.6543">A</text>
diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg
index 42475cb4..9d8441a5 100644
--- a/docs/test_cases/t00062_class_mermaid.svg
+++ b/docs/test_cases/t00062_class_mermaid.svg
@@ -306,7 +306,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L9">
+        <a transform="translate(247.9609375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L9">
           <g title="A" id="classId-C_0001046827200300090710-0" class="node default clickable">
             <rect height="79" width="73.25" y="-39.5" x="-36.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="36.625" x1="-36.625" class="divider"/>
@@ -330,7 +330,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L13">
+        <a transform="translate(247.9609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L13">
           <g title="A" id="classId-C_0001099548178945911245-1" class="node default clickable">
             <rect height="79" width="242.59375" y="-39.5" x="-121.296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="121.296875" x1="-121.296875" class="divider"/>
@@ -354,7 +354,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L18">
+        <a transform="translate(247.9609375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L18">
           <g title="A" id="classId-C_0001239388209995793547-2" class="node default clickable">
             <rect height="57" width="479.921875" y="-28.5" x="-239.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="239.9609375" x1="-239.9609375" class="divider"/>
@@ -373,7 +373,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L20">
+        <a transform="translate(485, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L20">
           <g title="A" id="classId-C_0000045701897814162098-3" class="node default clickable">
             <rect height="79" width="78.140625" y="-39.5" x="-39.0703125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="39.0703125" x1="-39.0703125" class="divider"/>
@@ -397,7 +397,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L24">
+        <a transform="translate(485, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L24">
           <g title="A" id="classId-C_0001379193770802992785-4" class="node default clickable">
             <rect height="79" width="131.484375" y="-39.5" x="-65.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="65.7421875" x1="-65.7421875" class="divider"/>
@@ -421,7 +421,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L28">
+        <a transform="translate(712.28125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L28">
           <g title="A" id="classId-C_0001407865337446777280-5" class="node default clickable">
             <rect height="79" width="276.421875" y="-39.5" x="-138.2109375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="138.2109375" x1="-138.2109375" class="divider"/>
@@ -445,7 +445,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L32">
+        <a transform="translate(942.671875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L32">
           <g title="A" id="classId-C_0001034483227649400416-6" class="node default clickable">
             <rect height="79" width="84.359375" y="-39.5" x="-42.1796875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.1796875" x1="-42.1796875" class="divider"/>
@@ -469,7 +469,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L36">
+        <a transform="translate(1092.8203125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L36">
           <g title="A" id="classId-C_0000352457857519671117-7" class="node default clickable">
             <rect height="79" width="115.9375" y="-39.5" x="-57.96875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="57.96875" x1="-57.96875" class="divider"/>
@@ -493,7 +493,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L40">
+        <a transform="translate(1246.515625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L40">
           <g title="A" id="classId-C_0000314708288320430272-8" class="node default clickable">
             <rect height="101" width="91.453125" y="-50.5" x="-45.7265625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="45.7265625" x1="-45.7265625" class="divider"/>
@@ -522,7 +522,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L45">
+        <a transform="translate(801.4609375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L45">
           <g title="A" id="classId-C_0000827753335392390402-9" class="node default clickable">
             <rect height="101" width="119.015625" y="-50.5" x="-59.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="59.5078125" x1="-59.5078125" class="divider"/>
@@ -551,7 +551,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L50">
+        <a transform="translate(1412.40625, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L50">
           <g title="A" id="classId-C_0000395583480407686249-10" class="node default clickable">
             <rect height="101" width="140.328125" y="-50.5" x="-70.1640625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="70.1640625" x1="-70.1640625" class="divider"/>
@@ -580,7 +580,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L55">
+        <a transform="translate(1412.40625, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L55">
           <g title="A" id="classId-C_0000476497055497873078-11" class="node default clickable">
             <rect height="79" width="152.75" y="-39.5" x="-76.375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.375" x1="-76.375" class="divider"/>
@@ -604,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L59">
+        <a transform="translate(1072.3828125, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L59">
           <g title="A" id="classId-C_0001619634759668095904-12" class="node default clickable">
             <rect height="101" width="167.875" y="-50.5" x="-83.9375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="83.9375" x1="-83.9375" class="divider"/>
@@ -633,7 +633,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L64">
+        <a transform="translate(1072.3828125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L64">
           <g title="A" id="classId-C_0001357746808315142717-13" class="node default clickable">
             <rect height="101" width="180.3125" y="-50.5" x="-90.15625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="90.15625" x1="-90.15625" class="divider"/>
@@ -662,7 +662,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L70">
+        <a transform="translate(1648.078125, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L70">
           <g title="A" id="classId-C_0000544335779197078982-14" class="node default clickable">
             <rect height="101" width="231.015625" y="-50.5" x="-115.5078125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="115.5078125" x1="-115.5078125" class="divider"/>
@@ -691,7 +691,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L75">
+        <a transform="translate(1864.2109375, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L75">
           <g title="A" id="classId-C_0000602066980416477930-15" class="node default clickable">
             <rect height="79" width="101.25" y="-39.5" x="-50.625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="50.625" x1="-50.625" class="divider"/>
@@ -715,7 +715,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L79">
+        <a transform="translate(1864.2109375, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L79">
           <g title="A" id="classId-C_0001318419672443856415-16" class="node default clickable">
             <rect height="79" width="170.203125" y="-39.5" x="-85.1015625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="85.1015625" x1="-85.1015625" class="divider"/>
@@ -739,7 +739,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L83">
+        <a transform="translate(2041.46875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L83">
           <g title="A" id="classId-C_0000599593856979463652-17" class="node default clickable">
             <rect height="79" width="153.265625" y="-39.5" x="-76.6328125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="76.6328125" x1="-76.6328125" class="divider"/>
@@ -763,7 +763,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L85">
+        <a transform="translate(2208.5, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L85">
           <g title="A" id="classId-C_0000015395295268000991-18" class="node default clickable">
             <rect height="79" width="80.796875" y="-39.5" x="-40.3984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="40.3984375" x1="-40.3984375" class="divider"/>
@@ -787,7 +787,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L89">
+        <a transform="translate(2341.75, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L89">
           <g title="A" id="classId-C_0001603321863498552207-19" class="node default clickable">
             <rect height="79" width="85.703125" y="-39.5" x="-42.8515625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="42.8515625" x1="-42.8515625" class="divider"/>
@@ -811,7 +811,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L95">
+        <a transform="translate(2533.9296875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L95">
           <g title="A" id="classId-C_0000232518961342221670-20" class="node default clickable">
             <rect height="101" width="198.65625" y="-50.5" x="-99.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -840,7 +840,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00062/t00062.cc#L7">
+        <a transform="translate(1412.40625, 489.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00062/t00062.cc#L7">
           <g title="A" id="classId-C_0000121103565834936476-21" class="node default clickable">
             <rect height="57" width="55.015625" y="-28.5" x="-27.5078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg
index 7dfe2eed..7de91621 100644
--- a/docs/test_cases/t00063_class.svg
+++ b/docs/test_cases/t00063_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="66px" preserveAspectRatio="none" style="width:58px;height:66px;" version="1.1" viewBox="0 0 58 66" width="58px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flsyxs99q9fn0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fe4gviime3him" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flsyxs99q9fn0)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00063/t00063.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00063/t00063.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe4gviime3him)" height="48" id="C_0001518171774798799557" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="7" y="7"/>
       <ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="36" y="27.1543">A</text>
diff --git a/docs/test_cases/t00063_class_mermaid.svg b/docs/test_cases/t00063_class_mermaid.svg
index cf132990..1012aa59 100644
--- a/docs/test_cases/t00063_class_mermaid.svg
+++ b/docs/test_cases/t00063_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00063/t00063.cc#L3">
+        <a transform="translate(21.28125, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00063/t00063.cc#L3">
           <g title="A" id="classId-C_0001518171774798799557-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
diff --git a/docs/test_cases/t00064.md b/docs/test_cases/t00064.md
index 1df262d4..55704b88 100644
--- a/docs/test_cases/t00064.md
+++ b/docs/test_cases/t00064.md
@@ -271,7 +271,7 @@ public:
               "template_parameters": []
             }
           ],
-          "type": "clanguml::t00064::type_list"
+          "type": "type_list"
         }
       ],
       "type": "class"
@@ -407,7 +407,7 @@ public:
               "template_parameters": []
             }
           ],
-          "type": "clanguml::t00064::type_list"
+          "type": "type_list"
         },
         {
           "is_variadic": false,
@@ -420,7 +420,7 @@ public:
               "template_parameters": []
             }
           ],
-          "type": "clanguml::t00064::type_list"
+          "type": "type_list"
         }
       ],
       "type": "class"
@@ -478,7 +478,7 @@ public:
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00064::type_group_pair_it<It,clanguml::t00064::type_list<First...>,clanguml::t00064::type_list<Second...>>::value_type"
+          "type": "type_group_pair_it<It,type_list<First...>,type_list<Second...>>::value_type"
         }
       ],
       "type": "class"
@@ -496,6 +496,7 @@ public:
       "methods": [
         {
           "access": "public",
+          "display_name": "get",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -523,10 +524,12 @@ public:
             "line": 44,
             "translation_unit": "t00064.cc"
           },
+          "template_parameters": [],
           "type": "ref_t"
         },
         {
           "access": "public",
+          "display_name": "getp",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -554,10 +557,12 @@ public:
             "line": 46,
             "translation_unit": "t00064.cc"
           },
+          "template_parameters": [],
           "type": "const value_type *"
         },
         {
           "access": "public",
+          "display_name": "find",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": true,
@@ -585,6 +590,7 @@ public:
             "line": 48,
             "translation_unit": "t00064.cc"
           },
+          "template_parameters": [],
           "type": "unsigned int"
         }
       ],
@@ -614,7 +620,7 @@ public:
               "template_parameters": []
             }
           ],
-          "type": "clanguml::t00064::type_list"
+          "type": "type_list"
         },
         {
           "is_variadic": false,
@@ -627,7 +633,7 @@ public:
               "template_parameters": []
             }
           ],
-          "type": "clanguml::t00064::type_list"
+          "type": "type_list"
         }
       ],
       "type": "class"
@@ -722,7 +728,7 @@ public:
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00064::A"
+          "type": "A"
         },
         {
           "is_variadic": false,
@@ -798,19 +804,19 @@ public:
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00064::A"
+          "type": "A"
         },
         {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00064::B"
+          "type": "B"
         },
         {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00064::C"
+          "type": "C"
         }
       ],
       "type": "class"
@@ -852,7 +858,7 @@ public:
               "type": "double"
             }
           ],
-          "type": "clanguml::t00064::type_list"
+          "type": "type_list"
         },
         {
           "is_variadic": false,
@@ -877,7 +883,7 @@ public:
               "type": "clanguml::t00064::C"
             }
           ],
-          "type": "clanguml::t00064::type_list"
+          "type": "type_list"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg
index f8538d7b..171d69af 100644
--- a/docs/test_cases/t00064_class.svg
+++ b/docs/test_cases/t00064_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="1373px" preserveAspectRatio="none" style="width:2348px;height:1373px;" version="1.1" viewBox="0 0 2348 1373" width="2348px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4yem2vn3i8m3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fdakaug8lau4t" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0002055044356505752139" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="2219.5" y="571.2"/>
       <ellipse cx="2234.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2237.4688,592.8406 Q2236.8906,593.1375 2236.25,593.2781 Q2235.6094,593.4344 2234.9063,593.4344 Q2232.4063,593.4344 2231.0781,591.7938 Q2229.7656,590.1375 2229.7656,587.0125 Q2229.7656,583.8875 2231.0781,582.2313 Q2232.4063,580.575 2234.9063,580.575 Q2235.6094,580.575 2236.25,580.7313 Q2236.9063,580.8875 2237.4688,581.1844 L2237.4688,583.9031 Q2236.8438,583.325 2236.25,583.0594 Q2235.6563,582.7781 2235.0313,582.7781 Q2233.6875,582.7781 2233,583.8563 Q2232.3125,584.9188 2232.3125,587.0125 Q2232.3125,589.1063 2233,590.1844 Q2233.6875,591.2469 2235.0313,591.2469 Q2235.6563,591.2469 2236.25,590.9813 Q2236.8438,590.7 2237.4688,590.1219 L2237.4688,592.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="2248.5" y="591.3543">type_list</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="603.2" y2="603.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2220.5" x2="2330.5" y1="611.2" y2="611.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L11" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L11" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001536403088019105838" style="stroke: #A80036; stroke-width: 1.5;" width="190" x="1773" y="245.2"/>
       <ellipse cx="1788" cy="261.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1790.9688,266.8406 Q1790.3906,267.1375 1789.75,267.2781 Q1789.1094,267.4344 1788.4063,267.4344 Q1785.9063,267.4344 1784.5781,265.7938 Q1783.2656,264.1375 1783.2656,261.0125 Q1783.2656,257.8875 1784.5781,256.2313 Q1785.9063,254.575 1788.4063,254.575 Q1789.1094,254.575 1789.75,254.7313 Q1790.4063,254.8875 1790.9688,255.1844 L1790.9688,257.9031 Q1790.3438,257.325 1789.75,257.0594 Q1789.1563,256.7781 1788.5313,256.7781 Q1787.1875,256.7781 1786.5,257.8563 Q1785.8125,258.9188 1785.8125,261.0125 Q1785.8125,263.1063 1786.5,264.1844 Q1787.1875,265.2469 1788.5313,265.2469 Q1789.1563,265.2469 1789.75,264.9813 Q1790.3438,264.7 1790.9688,264.1219 L1790.9688,266.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1802" y="265.3543">type_list</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="277.2" y2="277.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1774" x2="1962" y1="285.2" y2="285.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L13" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L13" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001613293628874851145" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="1787.5" y="494.2"/>
       <ellipse cx="1802.5" cy="510.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1805.4688,515.8406 Q1804.8906,516.1375 1804.25,516.2781 Q1803.6094,516.4344 1802.9063,516.4344 Q1800.4063,516.4344 1799.0781,514.7938 Q1797.7656,513.1375 1797.7656,510.0125 Q1797.7656,506.8875 1799.0781,505.2313 Q1800.4063,503.575 1802.9063,503.575 Q1803.6094,503.575 1804.25,503.7313 Q1804.9063,503.8875 1805.4688,504.1844 L1805.4688,506.9031 Q1804.8438,506.325 1804.25,506.0594 Q1803.6563,505.7781 1803.0313,505.7781 Q1801.6875,505.7781 1801,506.8563 Q1800.3125,507.9188 1800.3125,510.0125 Q1800.3125,512.1063 1801,513.1844 Q1801.6875,514.2469 1803.0313,514.2469 Q1803.6563,514.2469 1804.25,513.9813 Q1804.8438,513.7 1805.4688,513.1219 L1805.4688,515.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1816.5" y="514.3543">type_list</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="526.2" y2="526.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1788.5" x2="1947.5" y1="534.2" y2="534.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L17" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000096201031647373215" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="1789.5" y="91.2"/>
       <ellipse cx="1804.5" cy="107.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1807.4688,112.8406 Q1806.8906,113.1375 1806.25,113.2781 Q1805.6094,113.4344 1804.9063,113.4344 Q1802.4063,113.4344 1801.0781,111.7938 Q1799.7656,110.1375 1799.7656,107.0125 Q1799.7656,103.8875 1801.0781,102.2313 Q1802.4063,100.575 1804.9063,100.575 Q1805.6094,100.575 1806.25,100.7313 Q1806.9063,100.8875 1807.4688,101.1844 L1807.4688,103.9031 Q1806.8438,103.325 1806.25,103.0594 Q1805.6563,102.7781 1805.0313,102.7781 Q1803.6875,102.7781 1803,103.8563 Q1802.3125,104.9188 1802.3125,107.0125 Q1802.3125,109.1063 1803,110.1844 Q1803.6875,111.2469 1805.0313,111.2469 Q1805.6563,111.2469 1806.25,110.9813 Q1806.8438,110.7 1807.4688,110.1219 L1807.4688,112.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1818.5" y="111.3543">type_list</text>
@@ -49,8 +49,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="123.2" y2="123.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1790.5" x2="1945.5" y1="131.2" y2="131.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L17" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L17" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001342666740698875376" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1050.5" y="39.2"/>
       <ellipse cx="1065.5" cy="55.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1068.4688,60.8406 Q1067.8906,61.1375 1067.25,61.2781 Q1066.6094,61.4344 1065.9063,61.4344 Q1063.4063,61.4344 1062.0781,59.7938 Q1060.7656,58.1375 1060.7656,55.0125 Q1060.7656,51.8875 1062.0781,50.2313 Q1063.4063,48.575 1065.9063,48.575 Q1066.6094,48.575 1067.25,48.7313 Q1067.9063,48.8875 1068.4688,49.1844 L1068.4688,51.9031 Q1067.8438,51.325 1067.25,51.0594 Q1066.6563,50.7781 1066.0313,50.7781 Q1064.6875,50.7781 1064,51.8563 Q1063.3125,52.9188 1063.3125,55.0125 Q1063.3125,57.1063 1064,58.1844 Q1064.6875,59.2469 1066.0313,59.2469 Q1066.6563,59.2469 1067.25,58.9813 Q1067.8438,58.7 1068.4688,58.1219 L1068.4688,60.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1079.5" y="59.3543">head</text>
@@ -59,8 +59,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="71.2" y2="71.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1051.5" x2="1258.5" y1="79.2" y2="79.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L21" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L21" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000074655005329778311" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="1803.5" y="897.2"/>
       <ellipse cx="1818.5" cy="913.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1821.4688,918.8406 Q1820.8906,919.1375 1820.25,919.2781 Q1819.6094,919.4344 1818.9063,919.4344 Q1816.4063,919.4344 1815.0781,917.7938 Q1813.7656,916.1375 1813.7656,913.0125 Q1813.7656,909.8875 1815.0781,908.2313 Q1816.4063,906.575 1818.9063,906.575 Q1819.6094,906.575 1820.25,906.7313 Q1820.9063,906.8875 1821.4688,907.1844 L1821.4688,909.9031 Q1820.8438,909.325 1820.25,909.0594 Q1819.6563,908.7781 1819.0313,908.7781 Q1817.6875,908.7781 1817,909.8563 Q1816.3125,910.9188 1816.3125,913.0125 Q1816.3125,915.1063 1817,916.1844 Q1817.6875,917.2469 1819.0313,917.2469 Q1819.6563,917.2469 1820.25,916.9813 Q1820.8438,916.7 1821.4688,916.1219 L1821.4688,918.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1832.5" y="917.3543">type_list</text>
@@ -69,8 +69,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="929.2" y2="929.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1804.5" x2="1931.5" y1="937.2" y2="937.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001877705309010128195" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="1805.5" y="980.2"/>
       <ellipse cx="1820.5" cy="996.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1823.4688,1001.8406 Q1822.8906,1002.1375 1822.25,1002.2781 Q1821.6094,1002.4344 1820.9063,1002.4344 Q1818.4063,1002.4344 1817.0781,1000.7938 Q1815.7656,999.1375 1815.7656,996.0125 Q1815.7656,992.8875 1817.0781,991.2313 Q1818.4063,989.575 1820.9063,989.575 Q1821.6094,989.575 1822.25,989.7313 Q1822.9063,989.8875 1823.4688,990.1844 L1823.4688,992.9031 Q1822.8438,992.325 1822.25,992.0594 Q1821.6563,991.7781 1821.0313,991.7781 Q1819.6875,991.7781 1819,992.8563 Q1818.3125,993.9188 1818.3125,996.0125 Q1818.3125,998.1063 1819,999.1844 Q1819.6875,1000.2469 1821.0313,1000.2469 Q1821.6563,1000.2469 1822.25,999.9813 Q1822.8438,999.7 1823.4688,999.1219 L1823.4688,1001.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1834.5" y="1000.3543">type_list</text>
@@ -79,8 +79,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1012.2" y2="1012.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1806.5" x2="1929.5" y1="1020.2" y2="1020.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001737554639587928188" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1795" y="814.2"/>
       <ellipse cx="1810" cy="830.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1812.9688,835.8406 Q1812.3906,836.1375 1811.75,836.2781 Q1811.1094,836.4344 1810.4063,836.4344 Q1807.9063,836.4344 1806.5781,834.7938 Q1805.2656,833.1375 1805.2656,830.0125 Q1805.2656,826.8875 1806.5781,825.2313 Q1807.9063,823.575 1810.4063,823.575 Q1811.1094,823.575 1811.75,823.7313 Q1812.4063,823.8875 1812.9688,824.1844 L1812.9688,826.9031 Q1812.3438,826.325 1811.75,826.0594 Q1811.1563,825.7781 1810.5313,825.7781 Q1809.1875,825.7781 1808.5,826.8563 Q1807.8125,827.9188 1807.8125,830.0125 Q1807.8125,832.1063 1808.5,833.1844 Q1809.1875,834.2469 1810.5313,834.2469 Q1811.1563,834.2469 1811.75,833.9813 Q1812.3438,833.7 1812.9688,833.1219 L1812.9688,835.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1824" y="834.3543">type_list</text>
@@ -89,8 +89,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="846.2" y2="846.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1796" x2="1940" y1="854.2" y2="854.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="60.8047" id="C_0001313421318785708660" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="965.5" y="965.7"/>
       <ellipse cx="980.5" cy="981.7" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M983.4688,987.3406 Q982.8906,987.6375 982.25,987.7781 Q981.6094,987.9344 980.9063,987.9344 Q978.4063,987.9344 977.0781,986.2938 Q975.7656,984.6375 975.7656,981.5125 Q975.7656,978.3875 977.0781,976.7313 Q978.4063,975.075 980.9063,975.075 Q981.6094,975.075 982.25,975.2313 Q982.9063,975.3875 983.4688,975.6844 L983.4688,978.4031 Q982.8438,977.825 982.25,977.5594 Q981.6563,977.2781 981.0313,977.2781 Q979.6875,977.2781 979,978.3563 Q978.3125,979.4188 978.3125,981.5125 Q978.3125,983.6063 979,984.6844 Q979.6875,985.7469 981.0313,985.7469 Q981.6563,985.7469 982.25,985.4813 Q982.8438,985.2 983.4688,984.6219 L983.4688,987.3406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="994.5" y="985.8543">type_group_pair</text>
@@ -99,15 +99,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="997.7" y2="997.7"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="966.5" x2="1343.5" y1="1005.7" y2="1005.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="971.5" y="1011.7"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="973.5" y="1013.7"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L28" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L28" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="101" x="985.5" y="1019.9104">size : const size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0002110316024454672764" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="2217" y="1063.2"/>
       <ellipse cx="2232" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2234.9688,1084.8406 Q2234.3906,1085.1375 2233.75,1085.2781 Q2233.1094,1085.4344 2232.4063,1085.4344 Q2229.9063,1085.4344 2228.5781,1083.7938 Q2227.2656,1082.1375 2227.2656,1079.0125 Q2227.2656,1075.8875 2228.5781,1074.2313 Q2229.9063,1072.575 2232.4063,1072.575 Q2233.1094,1072.575 2233.75,1072.7313 Q2234.4063,1072.8875 2234.9688,1073.1844 L2234.9688,1075.9031 Q2234.3438,1075.325 2233.75,1075.0594 Q2233.1563,1074.7781 2232.5313,1074.7781 Q2231.1875,1074.7781 2230.5,1075.8563 Q2229.8125,1076.9188 2229.8125,1079.0125 Q2229.8125,1081.1063 2230.5,1082.1844 Q2231.1875,1083.2469 2232.5313,1083.2469 Q2233.1563,1083.2469 2233.75,1082.9813 Q2234.3438,1082.7 2234.9688,1082.1219 L2234.9688,1084.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="2246" y="1083.3543">optional_ref</text>
@@ -116,8 +116,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1095.2" y2="1095.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2218" x2="2333" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L31" target="_top" title="optional_ref" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L31" xlink:show="new" xlink:title="optional_ref" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000476531044436856932" style="stroke: #A80036; stroke-width: 1.5;" width="576" x="1580" y="1063.2"/>
       <ellipse cx="1595" cy="1079.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1597.9688,1084.8406 Q1597.3906,1085.1375 1596.75,1085.2781 Q1596.1094,1085.4344 1595.4063,1085.4344 Q1592.9063,1085.4344 1591.5781,1083.7938 Q1590.2656,1082.1375 1590.2656,1079.0125 Q1590.2656,1075.8875 1591.5781,1074.2313 Q1592.9063,1072.575 1595.4063,1072.575 Q1596.1094,1072.575 1596.75,1072.7313 Q1597.4063,1072.8875 1597.9688,1073.1844 L1597.9688,1075.9031 Q1597.3438,1075.325 1596.75,1075.0594 Q1596.1563,1074.7781 1595.5313,1074.7781 Q1594.1875,1074.7781 1593.5,1075.8563 Q1592.8125,1076.9188 1592.8125,1079.0125 Q1592.8125,1081.1063 1593.5,1082.1844 Q1594.1875,1083.2469 1595.5313,1083.2469 Q1596.1563,1083.2469 1596.75,1082.9813 Q1597.3438,1082.7 1597.9688,1082.1219 L1597.9688,1084.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="1609" y="1083.3543">optional_ref</text>
@@ -126,8 +126,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1095.2" y2="1095.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1581" x2="2155" y1="1103.2" y2="1103.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L35" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L35" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="86.4141" id="C_0001024383802991748694" style="stroke: #A80036; stroke-width: 1.5;" width="406" x="952" y="816.2"/>
       <ellipse cx="967" cy="832.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M969.9688,837.8406 Q969.3906,838.1375 968.75,838.2781 Q968.1094,838.4344 967.4063,838.4344 Q964.9063,838.4344 963.5781,836.7938 Q962.2656,835.1375 962.2656,832.0125 Q962.2656,828.8875 963.5781,827.2313 Q964.9063,825.575 967.4063,825.575 Q968.1094,825.575 968.75,825.7313 Q969.4063,825.8875 969.9688,826.1844 L969.9688,828.9031 Q969.3438,828.325 968.75,828.0594 Q968.1563,827.7781 967.5313,827.7781 Q966.1875,827.7781 965.5,828.8563 Q964.8125,829.9188 964.8125,832.0125 Q964.8125,834.1063 965.5,835.1844 Q966.1875,836.2469 967.5313,836.2469 Q968.1563,836.2469 968.75,835.9813 Q969.3438,835.7 969.9688,835.1219 L969.9688,837.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="981" y="836.3543">type_group_pair_it</text>
@@ -135,54 +135,54 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="256" x="1104" y="825.3387">It,type_list&lt;First...&gt;,type_list&lt;Second...&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="848.2" y2="848.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="854.2"/>
       <ellipse cx="963" cy="859.2" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L48" target="_top" title="find" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L48" xlink:show="new" xlink:title="find" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="290" x="972" y="862.4104">find(const value_type &amp; v) constexpr : unsigned int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="867.0047"/>
       <ellipse cx="963" cy="872.0047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L44" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L44" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="972" y="875.2151">get(unsigned int i) : ref_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="958" y="879.8094"/>
       <ellipse cx="963" cy="884.8094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L46" target="_top" title="getp" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L46" xlink:show="new" xlink:title="getp" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="227" x="972" y="888.0198">getp(unsigned int i) : const value_type *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="953" x2="1357" y1="894.6141" y2="894.6141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L51" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L51" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000586286676481245707" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="328.2"/>
       <ellipse cx="1863" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,349.8406 Q1865.3906,350.1375 1864.75,350.2781 Q1864.1094,350.4344 1863.4063,350.4344 Q1860.9063,350.4344 1859.5781,348.7938 Q1858.2656,347.1375 1858.2656,344.0125 Q1858.2656,340.8875 1859.5781,339.2313 Q1860.9063,337.575 1863.4063,337.575 Q1864.1094,337.575 1864.75,337.7313 Q1865.4063,337.8875 1865.9688,338.1844 L1865.9688,340.9031 Q1865.3438,340.325 1864.75,340.0594 Q1864.1563,339.7781 1863.5313,339.7781 Q1862.1875,339.7781 1861.5,340.8563 Q1860.8125,341.9188 1860.8125,344.0125 Q1860.8125,346.1063 1861.5,347.1844 Q1862.1875,348.2469 1863.5313,348.2469 Q1864.1563,348.2469 1864.75,347.9813 Q1865.3438,347.7 1865.9688,347.1219 L1865.9688,349.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="348.3543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="360.2" y2="360.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="368.2" y2="368.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L52" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L52" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001353306307770366167" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="648.2"/>
       <ellipse cx="1863" cy="664.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,669.8406 Q1865.3906,670.1375 1864.75,670.2781 Q1864.1094,670.4344 1863.4063,670.4344 Q1860.9063,670.4344 1859.5781,668.7938 Q1858.2656,667.1375 1858.2656,664.0125 Q1858.2656,660.8875 1859.5781,659.2313 Q1860.9063,657.575 1863.4063,657.575 Q1864.1094,657.575 1864.75,657.7313 Q1865.4063,657.8875 1865.9688,658.1844 L1865.9688,660.9031 Q1865.3438,660.325 1864.75,660.0594 Q1864.1563,659.7781 1863.5313,659.7781 Q1862.1875,659.7781 1861.5,660.8563 Q1860.8125,661.9188 1860.8125,664.0125 Q1860.8125,666.1063 1861.5,667.1844 Q1862.1875,668.2469 1863.5313,668.2469 Q1864.1563,668.2469 1864.75,667.9813 Q1865.3438,667.7 1865.9688,667.1219 L1865.9688,669.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="668.3543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="680.2" y2="680.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="688.2" y2="688.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L53" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L53" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000598044391549147725" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1848" y="411.2"/>
       <ellipse cx="1863" cy="427.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1865.9688,432.8406 Q1865.3906,433.1375 1864.75,433.2781 Q1864.1094,433.4344 1863.4063,433.4344 Q1860.9063,433.4344 1859.5781,431.7938 Q1858.2656,430.1375 1858.2656,427.0125 Q1858.2656,423.8875 1859.5781,422.2313 Q1860.9063,420.575 1863.4063,420.575 Q1864.1094,420.575 1864.75,420.7313 Q1865.4063,420.8875 1865.9688,421.1844 L1865.9688,423.9031 Q1865.3438,423.325 1864.75,423.0594 Q1864.1563,422.7781 1863.5313,422.7781 Q1862.1875,422.7781 1861.5,423.8563 Q1860.8125,424.9188 1860.8125,427.0125 Q1860.8125,429.1063 1861.5,430.1844 Q1862.1875,431.2469 1863.5313,431.2469 Q1864.1563,431.2469 1864.75,430.9813 Q1865.3438,430.7 1865.9688,430.1219 L1865.9688,432.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1877" y="431.3543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="443.2" y2="443.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1849" x2="1887" y1="451.2" y2="451.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L8" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L8" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000425551452299939770" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1082" y="328.2"/>
       <ellipse cx="1097" cy="344.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1099.9688,349.8406 Q1099.3906,350.1375 1098.75,350.2781 Q1098.1094,350.4344 1097.4063,350.4344 Q1094.9063,350.4344 1093.5781,348.7938 Q1092.2656,347.1375 1092.2656,344.0125 Q1092.2656,340.8875 1093.5781,339.2313 Q1094.9063,337.575 1097.4063,337.575 Q1098.1094,337.575 1098.75,337.7313 Q1099.4063,337.8875 1099.9688,338.1844 L1099.9688,340.9031 Q1099.3438,340.325 1098.75,340.0594 Q1098.1563,339.7781 1097.5313,339.7781 Q1096.1875,339.7781 1095.5,340.8563 Q1094.8125,341.9188 1094.8125,344.0125 Q1094.8125,346.1063 1095.5,347.1844 Q1096.1875,348.2469 1097.5313,348.2469 Q1098.1563,348.2469 1098.75,347.9813 Q1099.3438,347.7 1099.9688,347.1219 L1099.9688,349.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1111" y="348.3543">type_list</text>
@@ -191,8 +191,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="360.2" y2="360.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1083" x2="1227" y1="368.2" y2="368.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000179850898515269194" style="stroke: #A80036; stroke-width: 1.5;" width="162" x="1388" y="1208.2"/>
       <ellipse cx="1403" cy="1224.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1405.9688,1229.8406 Q1405.3906,1230.1375 1404.75,1230.2781 Q1404.1094,1230.4344 1403.4063,1230.4344 Q1400.9063,1230.4344 1399.5781,1228.7938 Q1398.2656,1227.1375 1398.2656,1224.0125 Q1398.2656,1220.8875 1399.5781,1219.2313 Q1400.9063,1217.575 1403.4063,1217.575 Q1404.1094,1217.575 1404.75,1217.7313 Q1405.4063,1217.8875 1405.9688,1218.1844 L1405.9688,1220.9031 Q1405.3438,1220.325 1404.75,1220.0594 Q1404.1563,1219.7781 1403.5313,1219.7781 Q1402.1875,1219.7781 1401.5,1220.8563 Q1400.8125,1221.9188 1400.8125,1224.0125 Q1400.8125,1226.1063 1401.5,1227.1844 Q1402.1875,1228.2469 1403.5313,1228.2469 Q1404.1563,1228.2469 1404.75,1227.9813 Q1405.3438,1227.7 1405.9688,1227.1219 L1405.9688,1229.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1417" y="1228.3543">type_list</text>
@@ -201,8 +201,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1240.2" y2="1240.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389" x2="1549" y1="1248.2" y2="1248.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" target="_top" title="type_list" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_list" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001070380438303872295" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="1095.5" y="571.2"/>
       <ellipse cx="1110.5" cy="587.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1113.4688,592.8406 Q1112.8906,593.1375 1112.25,593.2781 Q1111.6094,593.4344 1110.9063,593.4344 Q1108.4063,593.4344 1107.0781,591.7938 Q1105.7656,590.1375 1105.7656,587.0125 Q1105.7656,583.8875 1107.0781,582.2313 Q1108.4063,580.575 1110.9063,580.575 Q1111.6094,580.575 1112.25,580.7313 Q1112.9063,580.8875 1113.4688,581.1844 L1113.4688,583.9031 Q1112.8438,583.325 1112.25,583.0594 Q1111.6563,582.7781 1111.0313,582.7781 Q1109.6875,582.7781 1109,583.8563 Q1108.3125,584.9188 1108.3125,587.0125 Q1108.3125,589.1063 1109,590.1844 Q1109.6875,591.2469 1111.0313,591.2469 Q1111.6563,591.2469 1112.25,590.9813 Q1112.8438,590.7 1113.4688,590.1219 L1113.4688,592.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="51" x="1124.5" y="591.3543">type_list</text>
@@ -211,8 +211,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="603.2" y2="603.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1096.5" x2="1213.5" y1="611.2" y2="611.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001854055939974723413" style="stroke: #A80036; stroke-width: 1.5;" width="389" x="502" y="748.2"/>
       <ellipse cx="517" cy="764.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M519.9688,769.8406 Q519.3906,770.1375 518.75,770.2781 Q518.1094,770.4344 517.4063,770.4344 Q514.9063,770.4344 513.5781,768.7938 Q512.2656,767.1375 512.2656,764.0125 Q512.2656,760.8875 513.5781,759.2313 Q514.9063,757.575 517.4063,757.575 Q518.1094,757.575 518.75,757.7313 Q519.4063,757.8875 519.9688,758.1844 L519.9688,760.9031 Q519.3438,760.325 518.75,760.0594 Q518.1563,759.7781 517.5313,759.7781 Q516.1875,759.7781 515.5,760.8563 Q514.8125,761.9188 514.8125,764.0125 Q514.8125,766.1063 515.5,767.1844 Q516.1875,768.2469 517.5313,768.2469 Q518.1563,768.2469 518.75,767.9813 Q519.3438,767.7 519.9688,767.1219 L519.9688,769.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="531" y="768.3543">type_group_pair</text>
@@ -221,30 +221,30 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="780.2" y2="780.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="890" y1="788.2" y2="788.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="73.6094" id="C_0002161425587790795236" style="stroke: #A80036; stroke-width: 1.5;" width="399" x="6" y="586.2"/>
       <ellipse cx="197.25" cy="602.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,607.8406 Q199.6406,608.1375 199,608.2781 Q198.3594,608.4344 197.6563,608.4344 Q195.1563,608.4344 193.8281,606.7938 Q192.5156,605.1375 192.5156,602.0125 Q192.5156,598.8875 193.8281,597.2313 Q195.1563,595.575 197.6563,595.575 Q198.3594,595.575 199,595.7313 Q199.6563,595.8875 200.2188,596.1844 L200.2188,598.9031 Q199.5938,598.325 199,598.0594 Q198.4063,597.7781 197.7813,597.7781 Q196.4375,597.7781 195.75,598.8563 Q195.0625,599.9188 195.0625,602.0125 Q195.0625,604.1063 195.75,605.1844 Q196.4375,606.2469 197.7813,606.2469 Q198.4063,606.2469 199,605.9813 Q199.5938,605.7 200.2188,605.1219 L200.2188,607.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.75" y="606.3543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="618.2" y2="618.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="404" y1="626.2" y2="626.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L58" 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="632.2"/>
       <ellipse cx="17" cy="637.2" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L58" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L58" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="373" x="26" y="640.4104">abc : type_group_pair&lt;type_list&lt;float,double&gt;,type_list&lt;A,B,C&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="645.0047"/>
       <ellipse cx="17" cy="650.0047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L57" target="_top" title="aboolint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L57" xlink:show="new" xlink:title="aboolint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="175" x="26" y="653.2151">aboolint : type_list&lt;A,bool,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" target="_top" title="type_group_pair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25" xlink:show="new" xlink:title="type_group_pair" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0000271990753639572557" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="1735" y="1146.2"/>
       <ellipse cx="1750" cy="1162.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1752.9688,1167.8406 Q1752.3906,1168.1375 1751.75,1168.2781 Q1751.1094,1168.4344 1750.4063,1168.4344 Q1747.9063,1168.4344 1746.5781,1166.7938 Q1745.2656,1165.1375 1745.2656,1162.0125 Q1745.2656,1158.8875 1746.5781,1157.2313 Q1747.9063,1155.575 1750.4063,1155.575 Q1751.1094,1155.575 1751.75,1155.7313 Q1752.4063,1155.8875 1752.9688,1156.1844 L1752.9688,1158.9031 Q1752.3438,1158.325 1751.75,1158.0594 Q1751.1563,1157.7781 1750.5313,1157.7781 Q1749.1875,1157.7781 1748.5,1158.8563 Q1747.8125,1159.9188 1747.8125,1162.0125 Q1747.8125,1164.1063 1748.5,1165.1844 Q1749.1875,1166.2469 1750.5313,1166.2469 Q1751.1563,1166.2469 1751.75,1165.9813 Q1752.3438,1165.7 1752.9688,1165.1219 L1752.9688,1167.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="100" x="1764" y="1166.3543">type_group_pair</text>
@@ -253,8 +253,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1178.2" y2="1178.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1736" x2="2000" y1="1186.2" y2="1186.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L33" target="_top" title="type_group_pair_it" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L33" xlink:show="new" xlink:title="type_group_pair_it" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001057906395469156958" style="stroke: #A80036; stroke-width: 1.5;" width="347" x="1694.5" y="731.2"/>
       <ellipse cx="1709.5" cy="747.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1712.4688,752.8406 Q1711.8906,753.1375 1711.25,753.2781 Q1710.6094,753.4344 1709.9063,753.4344 Q1707.4063,753.4344 1706.0781,751.7938 Q1704.7656,750.1375 1704.7656,747.0125 Q1704.7656,743.8875 1706.0781,742.2313 Q1707.4063,740.575 1709.9063,740.575 Q1710.6094,740.575 1711.25,740.7313 Q1711.9063,740.8875 1712.4688,741.1844 L1712.4688,743.9031 Q1711.8438,743.325 1711.25,743.0594 Q1710.6563,742.7781 1710.0313,742.7781 Q1708.6875,742.7781 1708,743.8563 Q1707.3125,744.9188 1707.3125,747.0125 Q1707.3125,749.1063 1708,750.1844 Q1708.6875,751.2469 1710.0313,751.2469 Q1710.6563,751.2469 1711.25,750.9813 Q1711.8438,750.7 1712.4688,750.1219 L1712.4688,752.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="114" x="1723.5" y="751.3543">type_group_pair_it</text>
@@ -263,8 +263,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="763.2" y2="763.2"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1695.5" x2="2040.5" y1="771.2" y2="771.2"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4yem2vn3i8m3)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L15" target="_top" title="head" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L15" xlink:show="new" xlink:title="head" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdakaug8lau4t)" height="48" id="C_0001317314479884183399" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="1802.5" y="8.2"/>
       <ellipse cx="1817.5" cy="24.2" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1820.4688,29.8406 Q1819.8906,30.1375 1819.25,30.2781 Q1818.6094,30.4344 1817.9063,30.4344 Q1815.4063,30.4344 1814.0781,28.7938 Q1812.7656,27.1375 1812.7656,24.0125 Q1812.7656,20.8875 1814.0781,19.2313 Q1815.4063,17.575 1817.9063,17.575 Q1818.6094,17.575 1819.25,17.7313 Q1819.9063,17.8875 1820.4688,18.1844 L1820.4688,20.9031 Q1819.8438,20.325 1819.25,20.0594 Q1818.6563,19.7781 1818.0313,19.7781 Q1816.6875,19.7781 1816,20.8563 Q1815.3125,21.9188 1815.3125,24.0125 Q1815.3125,26.1063 1816,27.1844 Q1816.6875,28.2469 1818.0313,28.2469 Q1818.6563,28.2469 1819.25,27.9813 Q1819.8438,27.7 1820.4688,27.1219 L1820.4688,29.8406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1831.5" y="28.3543">head</text>
diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg
index 92eb40c9..1a88944d 100644
--- a/docs/test_cases/t00064_class_mermaid.svg
+++ b/docs/test_cases/t00064_class_mermaid.svg
@@ -390,7 +390,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L8">
+        <a transform="translate(2610.265625, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0002055044356505752139-0" class="node default clickable">
             <rect height="57" width="129.421875" y="-28.5" x="-64.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="64.7109375" x1="-64.7109375" class="divider"/>
@@ -409,7 +409,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L11">
+        <a transform="translate(120.7109375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L11">
           <g title="type_list" id="classId-C_0001536403088019105838-1" class="node default clickable">
             <rect height="57" width="225.421875" y="-28.5" x="-112.7109375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="112.7109375" x1="-112.7109375" class="divider"/>
@@ -428,7 +428,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L13">
+        <a transform="translate(378.8046875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L13">
           <g title="type_list" id="classId-C_0001613293628874851145-2" class="node default clickable">
             <rect height="57" width="190.765625" y="-28.5" x="-95.3828125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="95.3828125" x1="-95.3828125" class="divider"/>
@@ -447,7 +447,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L17">
+        <a transform="translate(1008.9609375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L17">
           <g title="type_list" id="classId-C_0000096201031647373215-3" class="node default clickable">
             <rect height="57" width="181.890625" y="-28.5" x="-90.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="90.9453125" x1="-90.9453125" class="divider"/>
@@ -466,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L17">
+        <a transform="translate(867.03515625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L17">
           <g title="head" id="classId-C_0001342666740698875376-4" class="node default clickable">
             <rect height="57" width="237.921875" y="-28.5" x="-118.9609375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="118.9609375" x1="-118.9609375" class="divider"/>
@@ -485,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L21">
+        <a transform="translate(793.96875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L21">
           <g title="type_list" id="classId-C_0000074655005329778311-5" class="node default clickable">
             <rect height="57" width="148.09375" y="-28.5" x="-74.046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="74.046875" x1="-74.046875" class="divider"/>
@@ -504,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27">
+        <a transform="translate(3052.19140625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001877705309010128195-6" class="node default clickable">
             <rect height="57" width="146.609375" y="-28.5" x="-73.3046875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="73.3046875" x1="-73.3046875" class="divider"/>
@@ -523,7 +523,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27">
+        <a transform="translate(2107.67578125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27">
           <g title="type_list" id="classId-C_0001737554639587928188-7" class="node default clickable">
             <rect height="57" width="169.734375" y="-28.5" x="-84.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="84.8671875" x1="-84.8671875" class="divider"/>
@@ -542,7 +542,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L27">
+        <a transform="translate(1740.6015625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L27">
           <g title="type_group_pair" id="classId-C_0001313421318785708660-8" class="node default clickable">
             <rect height="79" width="449.828125" y="-39.5" x="-224.9140625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="224.9140625" x1="-224.9140625" class="divider"/>
@@ -566,7 +566,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2206.2734375, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0002110316024454672764-9" class="node default clickable">
             <rect height="57" width="135.03125" y="-28.5" x="-67.515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="67.515625" x1="-67.515625" class="divider"/>
@@ -585,7 +585,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L31">
+        <a transform="translate(2585.71484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L31">
           <g title="optional_ref" id="classId-C_0000476531044436856932-10" class="node default clickable">
             <rect height="57" width="686.34375" y="-28.5" x="-343.171875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="343.171875" x1="-343.171875" class="divider"/>
@@ -604,7 +604,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L35">
+        <a transform="translate(2530.625, 363.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L35">
           <g title="type_group_pair_it" id="classId-C_0001024383802991748694-11" class="node default clickable">
             <rect height="123" width="482.71875" y="-61.5" x="-241.359375" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="241.359375" x1="-241.359375" class="divider"/>
@@ -638,7 +638,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L51">
+        <a transform="translate(3702.70703125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L51">
           <g title="A" id="classId-C_0000586286676481245707-12" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -657,7 +657,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L52">
+        <a transform="translate(3490.73828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L52">
           <g title="B" id="classId-C_0001353306307770366167-13" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -676,7 +676,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L53">
+        <a transform="translate(3392.8828125, 610.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L53">
           <g title="C" id="classId-C_0000598044391549147725-14" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -695,7 +695,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L8">
+        <a transform="translate(3738.25, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L8">
           <g title="type_list" id="classId-C_0000425551452299939770-15" class="node default clickable">
             <rect height="57" width="172.359375" y="-28.5" x="-86.1796875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="86.1796875" x1="-86.1796875" class="divider"/>
@@ -714,7 +714,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3479.1171875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0000179850898515269194-16" class="node default clickable">
             <rect height="57" width="189.265625" y="-28.5" x="-94.6328125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -733,7 +733,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3263.40625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25">
           <g title="type_list" id="classId-C_0001070380438303872295-17" class="node default clickable">
             <rect height="57" width="142.15625" y="-28.5" x="-71.078125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="71.078125" x1="-71.078125" class="divider"/>
@@ -752,7 +752,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25">
+        <a transform="translate(3346.109375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0001854055939974723413-18" class="node default clickable">
             <rect height="57" width="464.90625" y="-28.5" x="-232.453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="232.453125" x1="-232.453125" class="divider"/>
@@ -771,7 +771,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L55">
+        <a transform="translate(3604.8515625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L55">
           <g title="R" id="classId-C_0002161425587790795236-19" class="node default clickable">
             <rect height="101" width="481.546875" y="-50.5" x="-240.7734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="240.7734375" x1="-240.7734375" class="divider"/>
@@ -800,7 +800,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L25">
+        <a transform="translate(1306.3515625, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L25">
           <g title="type_group_pair" id="classId-C_0000271990753639572557-20" class="node default clickable">
             <rect height="57" width="312.890625" y="-28.5" x="-156.4453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="156.4453125" x1="-156.4453125" class="divider"/>
@@ -819,7 +819,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L33">
+        <a transform="translate(1767.45703125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L33">
           <g title="type_group_pair_it" id="classId-C_0001057906395469156958-21" class="node default clickable">
             <rect height="57" width="410.703125" y="-28.5" x="-205.3515625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="205.3515625" x1="-205.3515625" class="divider"/>
@@ -838,7 +838,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00064/t00064.cc#L15">
+        <a transform="translate(597.0546875, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00064/t00064.cc#L15">
           <g title="head" id="classId-C_0001317314479884183399-22" class="node default clickable">
             <rect height="57" width="145.734375" y="-28.5" x="-72.8671875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="72.8671875" x1="-72.8671875" class="divider"/>
diff --git a/docs/test_cases/t00065.md b/docs/test_cases/t00065.md
index 8cdc37ed..141c7de0 100644
--- a/docs/test_cases/t00065.md
+++ b/docs/test_cases/t00065.md
@@ -120,7 +120,7 @@ struct AImpl { };
           "elements": [
             {
               "bases": [],
-              "display_name": "detail::AImpl",
+              "display_name": "AImpl",
               "id": "674757414308736755",
               "is_abstract": false,
               "is_nested": false,
@@ -291,6 +291,7 @@ struct AImpl { };
           "methods": [
             {
               "access": "public",
+              "display_name": "B",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -313,10 +314,12 @@ struct AImpl { };
                 "line": 8,
                 "translation_unit": "t00065.cc"
               },
+              "template_parameters": [],
               "type": "void"
             },
             {
               "access": "public",
+              "display_name": "b",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -339,6 +342,7 @@ struct AImpl { };
                 "line": 9,
                 "translation_unit": "t00065.cc"
               },
+              "template_parameters": [],
               "type": "void"
             }
           ],
@@ -502,7 +506,7 @@ struct AImpl { };
               "is_variadic": false,
               "kind": "argument",
               "template_parameters": [],
-              "type": "clanguml::t00065::B"
+              "type": "B"
             }
           ],
           "type": "class"
@@ -531,7 +535,7 @@ struct AImpl { };
               "is_variadic": false,
               "kind": "argument",
               "template_parameters": [],
-              "type": "clanguml::t00065::B"
+              "type": "B"
             }
           ],
           "type": "class"
diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg
index 34e07855..1d3f720c 100644
--- a/docs/test_cases/t00065_class.svg
+++ b/docs/test_cases/t00065_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="792px" preserveAspectRatio="none" style="width:767px;height:792px;" version="1.1" viewBox="0 0 767 792" width="767px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="792px" preserveAspectRatio="none" style="width:746px;height:792px;" version="1.1" viewBox="0 0 746 792" width="746px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1py8f6f4pn4bc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fl5bb4p75fbnl" 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,20 +9,20 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1py8f6f4pn4bc)" points="22,157,96,157,103,179.2969,368,179.2969,368,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fl5bb4p75fbnl)" points="22,157,96,157,103,179.2969,347,179.2969,347,464,22,464,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="103" y1="179.2969" y2="179.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="26" y="171.9951">module1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1py8f6f4pn4bc)" points="204,341,316,341,323,363.2969,344,363.2969,344,440,204,440,204,341" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="323" y1="363.2969" y2="363.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="106" x="208" y="355.9951">submodule1a</text>
-    <polygon fill="#FFFFFF" filter="url(#f1py8f6f4pn4bc)" points="392,176,466,176,473,198.2969,745,198.2969,745,780,392,780,392,176" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="392" x2="473" y1="198.2969" y2="198.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="396" y="190.9951">module2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1py8f6f4pn4bc)" points="486,513,565,513,572,535.2969,622,535.2969,622,656,486,656,486,513" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="486" x2="572" y1="535.2969" y2="535.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="73" x="490" y="527.9951">concepts</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
+    <polygon fill="#FFFFFF" filter="url(#fl5bb4p75fbnl)" points="201,341,313,341,320,363.2969,323,363.2969,323,440,201,440,201,341" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="201" x2="320" y1="363.2969" y2="363.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="106" x="205" y="355.9951">submodule1a</text>
+    <polygon fill="#FFFFFF" filter="url(#fl5bb4p75fbnl)" points="371,176,445,176,452,198.2969,724,198.2969,724,780,371,780,371,176" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="371" x2="452" y1="198.2969" y2="198.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="375" y="190.9951">module2</text>
+    <polygon fill="#FFFFFF" filter="url(#fl5bb4p75fbnl)" points="465,513,544,513,551,535.2969,601,535.2969,601,656,465,656,465,513" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="465" x2="551" y1="535.2969" y2="535.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="73" x="469" y="527.9951">concepts</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L8" target="_top" title="ABC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L8" xlink:show="new" xlink:title="ABC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="86.4141" id="C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="129" y="357"/>
       <ellipse cx="144" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.1094,379 L140.3906,379 L140.3906,366.6094 L148.1094,366.6094 L148.1094,368.7656 L142.8438,368.7656 L142.8438,371.4375 L147.6094,371.4375 L147.6094,373.5938 L142.8438,373.5938 L142.8438,376.8438 L148.1094,376.8438 L148.1094,379 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="158" y="377.1543">ABC</text>
@@ -32,8 +32,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="6" x="135" y="428.8198">c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="130" x2="184" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L10" target="_top" title="XYZ" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L10" xlink:show="new" xlink:title="XYZ" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="86.4141" id="C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="38.5" y="357"/>
       <ellipse cx="53.5" cy="373" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M57.6094,379 L49.8906,379 L49.8906,366.6094 L57.6094,366.6094 L57.6094,368.7656 L52.3438,368.7656 L52.3438,371.4375 L57.1094,371.4375 L57.1094,373.5938 L52.3438,373.5938 L52.3438,376.8438 L57.6094,376.8438 L57.6094,379 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="67.5" y="377.1543">XYZ</text>
@@ -43,216 +43,216 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="5" x="44.5" y="428.8198">z</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="92.5" y1="435.4141" y2="435.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="140.5" y="192"/>
-      <ellipse cx="206.75" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M209.7188,213.6406 Q209.1406,213.9375 208.5,214.0781 Q207.8594,214.2344 207.1563,214.2344 Q204.6563,214.2344 203.3281,212.5938 Q202.0156,210.9375 202.0156,207.8125 Q202.0156,204.6875 203.3281,203.0313 Q204.6563,201.375 207.1563,201.375 Q207.8594,201.375 208.5,201.5313 Q209.1563,201.6875 209.7188,201.9844 L209.7188,204.7031 Q209.0938,204.125 208.5,203.8594 Q207.9063,203.5781 207.2813,203.5781 Q205.9375,203.5781 205.25,204.6563 Q204.5625,205.7188 204.5625,207.8125 Q204.5625,209.9063 205.25,210.9844 Q205.9375,212.0469 207.2813,212.0469 Q207.9063,212.0469 208.5,211.7813 Q209.0938,211.5 209.7188,210.9219 L209.7188,213.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="227.25" y="212.1543">A</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="141.5" x2="288.5" y1="224" y2="224"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="141.5" x2="288.5" y1="232" y2="232"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="86.4141" id="C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="130.5" y="192"/>
+      <ellipse cx="196.75" cy="208" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M199.7188,213.6406 Q199.1406,213.9375 198.5,214.0781 Q197.8594,214.2344 197.1563,214.2344 Q194.6563,214.2344 193.3281,212.5938 Q192.0156,210.9375 192.0156,207.8125 Q192.0156,204.6875 193.3281,203.0313 Q194.6563,201.375 197.1563,201.375 Q197.8594,201.375 198.5,201.5313 Q199.1563,201.6875 199.7188,201.9844 L199.7188,204.7031 Q199.0938,204.125 198.5,203.8594 Q197.9063,203.5781 197.2813,203.5781 Q195.9375,203.5781 195.25,204.6563 Q194.5625,205.7188 194.5625,207.8125 Q194.5625,209.9063 195.25,210.9844 Q195.9375,212.0469 197.2813,212.0469 Q197.9063,212.0469 198.5,211.7813 Q199.0938,211.5 199.7188,210.9219 L199.7188,213.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="217.25" y="212.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="278.5" y1="224" y2="224"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="278.5" y1="232" y2="232"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="238"/>
-      <ellipse cx="151.5" cy="243" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="238"/>
+      <ellipse cx="141.5" cy="243" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="160.5" y="246.2104">abc : ABC</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L13" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L13" xlink:show="new" xlink:title="abc" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="150.5" y="246.2104">abc : ABC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="250.8047"/>
-      <ellipse cx="151.5" cy="255.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="250.8047"/>
+      <ellipse cx="141.5" cy="255.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="160.5" y="259.0151">pimpl : detail::AImpl *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L15" target="_top" title="pimpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L15" xlink:show="new" xlink:title="pimpl" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="150.5" y="259.0151">pimpl : detail::AImpl *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="146.5" y="263.6094"/>
-      <ellipse cx="151.5" cy="268.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136.5" y="263.6094"/>
+      <ellipse cx="141.5" cy="268.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="160.5" y="271.8198">xyz : XYZ</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L14" target="_top" title="xyz" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L14" xlink:show="new" xlink:title="xyz" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="150.5" y="271.8198">xyz : XYZ</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="220" y="376"/>
-      <ellipse cx="235" cy="392" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M237.9688,397.6406 Q237.3906,397.9375 236.75,398.0781 Q236.1094,398.2344 235.4063,398.2344 Q232.9063,398.2344 231.5781,396.5938 Q230.2656,394.9375 230.2656,391.8125 Q230.2656,388.6875 231.5781,387.0313 Q232.9063,385.375 235.4063,385.375 Q236.1094,385.375 236.75,385.5313 Q237.4063,385.6875 237.9688,385.9844 L237.9688,388.7031 Q237.3438,388.125 236.75,387.8594 Q236.1563,387.5781 235.5313,387.5781 Q234.1875,387.5781 233.5,388.6563 Q232.8125,389.7188 232.8125,391.8125 Q232.8125,393.9063 233.5,394.9844 Q234.1875,396.0469 235.5313,396.0469 Q236.1563,396.0469 236.75,395.7813 Q237.3438,395.5 237.9688,394.9219 L237.9688,397.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="249" y="396.1543">detail::AImpl</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="327" y1="408" y2="408"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="327" y1="416" y2="416"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/submodule1a/submodule1a.h#L6" target="_top" title="AImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/submodule1a/submodule1a.h#L6" xlink:show="new" xlink:title="AImpl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="48" id="C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="220.5" y="376"/>
+      <ellipse cx="235.5" cy="392" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M238.4688,397.6406 Q237.8906,397.9375 237.25,398.0781 Q236.6094,398.2344 235.9063,398.2344 Q233.4063,398.2344 232.0781,396.5938 Q230.7656,394.9375 230.7656,391.8125 Q230.7656,388.6875 232.0781,387.0313 Q233.4063,385.375 235.9063,385.375 Q236.6094,385.375 237.25,385.5313 Q237.9063,385.6875 238.4688,385.9844 L238.4688,388.7031 Q237.8438,388.125 237.25,387.8594 Q236.6563,387.5781 236.0313,387.5781 Q234.6875,387.5781 234,388.6563 Q233.3125,389.7188 233.3125,391.8125 Q233.3125,393.9063 234,394.9844 Q234.6875,396.0469 236.0313,396.0469 Q236.6563,396.0469 237.25,395.7813 Q237.8438,395.5 238.4688,394.9219 L238.4688,397.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="396.1543">AImpl</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221.5" x2="284.5" y1="408" y2="408"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="221.5" x2="284.5" y1="416" y2="416"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="445.5" y="359"/>
-      <ellipse cx="503.75" cy="375" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M506.7188,380.6406 Q506.1406,380.9375 505.5,381.0781 Q504.8594,381.2344 504.1563,381.2344 Q501.6563,381.2344 500.3281,379.5938 Q499.0156,377.9375 499.0156,374.8125 Q499.0156,371.6875 500.3281,370.0313 Q501.6563,368.375 504.1563,368.375 Q504.8594,368.375 505.5,368.5313 Q506.1563,368.6875 506.7188,368.9844 L506.7188,371.7031 Q506.0938,371.125 505.5,370.8594 Q504.9063,370.5781 504.2813,370.5781 Q502.9375,370.5781 502.25,371.6563 Q501.5625,372.7188 501.5625,374.8125 Q501.5625,376.9063 502.25,377.9844 Q502.9375,379.0469 504.2813,379.0469 Q504.9063,379.0469 505.5,378.7813 Q506.0938,378.5 506.7188,377.9219 L506.7188,380.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="524.25" y="379.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="446.5" x2="577.5" y1="391" y2="391"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="81.6094" id="C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.5;" width="133" x="424.5" y="359"/>
+      <ellipse cx="482.75" cy="375" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M485.7188,380.6406 Q485.1406,380.9375 484.5,381.0781 Q483.8594,381.2344 483.1563,381.2344 Q480.6563,381.2344 479.3281,379.5938 Q478.0156,377.9375 478.0156,374.8125 Q478.0156,371.6875 479.3281,370.0313 Q480.6563,368.375 483.1563,368.375 Q483.8594,368.375 484.5,368.5313 Q485.1563,368.6875 485.7188,368.9844 L485.7188,371.7031 Q485.0938,371.125 484.5,370.8594 Q483.9063,370.5781 483.2813,370.5781 Q481.9375,370.5781 481.25,371.6563 Q480.5625,372.7188 480.5625,374.8125 Q480.5625,376.9063 481.25,377.9844 Q481.9375,379.0469 483.2813,379.0469 Q483.9063,379.0469 484.5,378.7813 Q485.0938,378.5 485.7188,377.9219 L485.7188,380.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="503.25" y="379.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="425.5" x2="556.5" y1="391" y2="391"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="451.5" y="397"/>
-      <ellipse cx="456.5" cy="402" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="430.5" y="397"/>
+      <ellipse cx="435.5" cy="402" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="465.5" y="405.2104">B() = default : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="444.5" y="405.2104">B() = default : void</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="446.5" x2="577.5" y1="411.8047" y2="411.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.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="451.5" y="417.8047"/>
-      <ellipse cx="456.5" cy="422.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="425.5" x2="556.5" y1="411.8047" y2="411.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.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="430.5" y="417.8047"/>
+      <ellipse cx="435.5" cy="422.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="465.5" y="426.0151">b() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="444.5" y="426.0151">b() : void</text>
     </a>
-    <line style="stroke: #A80036; stroke-width: 1.5;" x1="446.5" x2="577.5" y1="432.6094" y2="432.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="524.5" y="703"/>
-      <ellipse cx="543.1" cy="719" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M546.0688,724.6406 Q545.4906,724.9375 544.85,725.0781 Q544.2094,725.2344 543.5063,725.2344 Q541.0063,725.2344 539.6781,723.5938 Q538.3656,721.9375 538.3656,718.8125 Q538.3656,715.6875 539.6781,714.0313 Q541.0063,712.375 543.5063,712.375 Q544.2094,712.375 544.85,712.5313 Q545.5063,712.6875 546.0688,712.9844 L546.0688,715.7031 Q545.4438,715.125 544.85,714.8594 Q544.2563,714.5781 543.6313,714.5781 Q542.2875,714.5781 541.6,715.6563 Q540.9125,716.7188 540.9125,718.8125 Q540.9125,720.9063 541.6,721.9844 Q542.2875,723.0469 543.6313,723.0469 Q544.2563,723.0469 544.85,722.7813 Q545.4438,722.5 546.0688,721.9219 L546.0688,724.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="557.9" y="723.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="577.5" y="700"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="578.5" y="712.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="525.5" x2="582.5" y1="735" y2="735"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="525.5" x2="582.5" y1="743" y2="743"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="425.5" x2="556.5" y1="432.6094" y2="432.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="60.8047" id="C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="503.5" y="703"/>
+      <ellipse cx="522.1" cy="719" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M525.0688,724.6406 Q524.4906,724.9375 523.85,725.0781 Q523.2094,725.2344 522.5063,725.2344 Q520.0063,725.2344 518.6781,723.5938 Q517.3656,721.9375 517.3656,718.8125 Q517.3656,715.6875 518.6781,714.0313 Q520.0063,712.375 522.5063,712.375 Q523.2094,712.375 523.85,712.5313 Q524.5063,712.6875 525.0688,712.9844 L525.0688,715.7031 Q524.4438,715.125 523.85,714.8594 Q523.2563,714.5781 522.6313,714.5781 Q521.2875,714.5781 520.6,715.6563 Q519.9125,716.7188 519.9125,718.8125 Q519.9125,720.9063 520.6,721.9844 Q521.2875,723.0469 522.6313,723.0469 Q523.2563,723.0469 523.85,722.7813 Q524.4438,722.5 525.0688,721.9219 L525.0688,724.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="536.9" y="723.1543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="556.5" y="700"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="557.5" y="712.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="504.5" x2="561.5" y1="735" y2="735"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="504.5" x2="561.5" y1="743" y2="743"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="530.5" y="749"/>
-      <ellipse cx="535.5" cy="754" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="509.5" y="749"/>
+      <ellipse cx="514.5" cy="754" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="544.5" y="757.2104">t : T *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L13" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L13" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="523.5" y="757.2104">t : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="641" y="570"/>
-      <ellipse cx="656" cy="586" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M658.9688,591.6406 Q658.3906,591.9375 657.75,592.0781 Q657.1094,592.2344 656.4063,592.2344 Q653.9063,592.2344 652.5781,590.5938 Q651.2656,588.9375 651.2656,585.8125 Q651.2656,582.6875 652.5781,581.0313 Q653.9063,579.375 656.4063,579.375 Q657.1094,579.375 657.75,579.5313 Q658.4063,579.6875 658.9688,579.9844 L658.9688,582.7031 Q658.3438,582.125 657.75,581.8594 Q657.1563,581.5781 656.5313,581.5781 Q655.1875,581.5781 654.5,582.6563 Q653.8125,583.7188 653.8125,585.8125 Q653.8125,587.9063 654.5,588.9844 Q655.1875,590.0469 656.5313,590.0469 Q657.1563,590.0469 657.75,589.7813 Q658.3438,589.5 658.9688,588.9219 L658.9688,591.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="670" y="590.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="686" y="567"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="687" y="579.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="700" y1="602" y2="602"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="642" x2="700" y1="610" y2="610"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="48" id="C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="620" y="570"/>
+      <ellipse cx="635" cy="586" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M637.9688,591.6406 Q637.3906,591.9375 636.75,592.0781 Q636.1094,592.2344 635.4063,592.2344 Q632.9063,592.2344 631.5781,590.5938 Q630.2656,588.9375 630.2656,585.8125 Q630.2656,582.6875 631.5781,581.0313 Q632.9063,579.375 635.4063,579.375 Q636.1094,579.375 636.75,579.5313 Q637.4063,579.6875 637.9688,579.9844 L637.9688,582.7031 Q637.3438,582.125 636.75,581.8594 Q636.1563,581.5781 635.5313,581.5781 Q634.1875,581.5781 633.5,582.6563 Q632.8125,583.7188 632.8125,585.8125 Q632.8125,587.9063 633.5,588.9844 Q634.1875,590.0469 635.5313,590.0469 Q636.1563,590.0469 636.75,589.7813 Q637.3438,589.5 637.9688,588.9219 L637.9688,591.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="649" y="590.1543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="665" y="567"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="666" y="579.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="621" x2="679" y1="602" y2="602"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="621" x2="679" y1="610" y2="610"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="613.5" y="363"/>
-      <ellipse cx="628.5" cy="379" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M631.4688,384.6406 Q630.8906,384.9375 630.25,385.0781 Q629.6094,385.2344 628.9063,385.2344 Q626.4063,385.2344 625.0781,383.5938 Q623.7656,381.9375 623.7656,378.8125 Q623.7656,375.6875 625.0781,374.0313 Q626.4063,372.375 628.9063,372.375 Q629.6094,372.375 630.25,372.5313 Q630.9063,372.6875 631.4688,372.9844 L631.4688,375.7031 Q630.8438,375.125 630.25,374.8594 Q629.6563,374.5781 629.0313,374.5781 Q627.6875,374.5781 627,375.6563 Q626.3125,376.7188 626.3125,378.8125 Q626.3125,380.9063 627,381.9844 Q627.6875,383.0469 629.0313,383.0469 Q629.6563,383.0469 630.25,382.7813 Q630.8438,382.5 631.4688,381.9219 L631.4688,384.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="642.5" y="383.1543">D</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="659.5" y="360"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="660.5" y="372.1387">bconcept T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="614.5" x2="727.5" y1="395" y2="395"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="614.5" x2="727.5" y1="403" y2="403"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="73.6094" id="C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="592.5" y="363"/>
+      <ellipse cx="607.5" cy="379" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M610.4688,384.6406 Q609.8906,384.9375 609.25,385.0781 Q608.6094,385.2344 607.9063,385.2344 Q605.4063,385.2344 604.0781,383.5938 Q602.7656,381.9375 602.7656,378.8125 Q602.7656,375.6875 604.0781,374.0313 Q605.4063,372.375 607.9063,372.375 Q608.6094,372.375 609.25,372.5313 Q609.9063,372.6875 610.4688,372.9844 L610.4688,375.7031 Q609.8438,375.125 609.25,374.8594 Q608.6563,374.5781 608.0313,374.5781 Q606.6875,374.5781 606,375.6563 Q605.3125,376.7188 605.3125,378.8125 Q605.3125,380.9063 606,381.9844 Q606.6875,383.0469 608.0313,383.0469 Q608.6563,383.0469 609.25,382.7813 Q609.8438,382.5 610.4688,381.9219 L610.4688,384.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="621.5" y="383.1543">D</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="72" x="638.5" y="360"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="70" x="639.5" y="372.1387">bconcept T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="593.5" x2="706.5" y1="395" y2="395"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="593.5" x2="706.5" y1="403" y2="403"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="619.5" y="409"/>
-      <ellipse cx="624.5" cy="414" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598.5" y="409"/>
+      <ellipse cx="603.5" cy="414" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="633.5" y="417.2104">c : C&lt;int&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="612.5" y="417.2104">c : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="619.5" y="421.8047"/>
-      <ellipse cx="624.5" cy="426.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="598.5" y="421.8047"/>
+      <ellipse cx="603.5" cy="426.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="633.5" y="430.0151">t : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L17" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L17" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="612.5" y="430.0151">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="408" y="211"/>
-      <ellipse cx="423" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M425.9688,232.6406 Q425.3906,232.9375 424.75,233.0781 Q424.1094,233.2344 423.4063,233.2344 Q420.9063,233.2344 419.5781,231.5938 Q418.2656,229.9375 418.2656,226.8125 Q418.2656,223.6875 419.5781,222.0313 Q420.9063,220.375 423.4063,220.375 Q424.1094,220.375 424.75,220.5313 Q425.4063,220.6875 425.9688,220.9844 L425.9688,223.7031 Q425.3438,223.125 424.75,222.8594 Q424.1563,222.5781 423.5313,222.5781 Q422.1875,222.5781 421.5,223.6563 Q420.8125,224.7188 420.8125,226.8125 Q420.8125,228.9063 421.5,229.9844 Q422.1875,231.0469 423.5313,231.0469 Q424.1563,231.0469 424.75,230.7813 Q425.3438,230.5 425.9688,229.9219 L425.9688,232.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="437" y="231.1543">C</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="453" y="208"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="454" y="220.1387">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="409" x2="459" y1="243" y2="243"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="409" x2="459" y1="251" y2="251"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="48" id="C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="387" y="211"/>
+      <ellipse cx="402" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M404.9688,232.6406 Q404.3906,232.9375 403.75,233.0781 Q403.1094,233.2344 402.4063,233.2344 Q399.9063,233.2344 398.5781,231.5938 Q397.2656,229.9375 397.2656,226.8125 Q397.2656,223.6875 398.5781,222.0313 Q399.9063,220.375 402.4063,220.375 Q403.1094,220.375 403.75,220.5313 Q404.4063,220.6875 404.9688,220.9844 L404.9688,223.7031 Q404.3438,223.125 403.75,222.8594 Q403.1563,222.5781 402.5313,222.5781 Q401.1875,222.5781 400.5,223.6563 Q399.8125,224.7188 399.8125,226.8125 Q399.8125,228.9063 400.5,229.9844 Q401.1875,231.0469 402.5313,231.0469 Q403.1563,231.0469 403.75,230.7813 Q404.3438,230.5 404.9688,229.9219 L404.9688,232.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="416" y="231.1543">C</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="432" y="208"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="433" y="220.1387">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="388" x2="438" y1="243" y2="243"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="388" x2="438" y1="251" y2="251"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="495.5" y="211"/>
-      <ellipse cx="510.5" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M513.4688,232.6406 Q512.8906,232.9375 512.25,233.0781 Q511.6094,233.2344 510.9063,233.2344 Q508.4063,233.2344 507.0781,231.5938 Q505.7656,229.9375 505.7656,226.8125 Q505.7656,223.6875 507.0781,222.0313 Q508.4063,220.375 510.9063,220.375 Q511.6094,220.375 512.25,220.5313 Q512.9063,220.6875 513.4688,220.9844 L513.4688,223.7031 Q512.8438,223.125 512.25,222.8594 Q511.6563,222.5781 511.0313,222.5781 Q509.6875,222.5781 509,223.6563 Q508.3125,224.7188 508.3125,226.8125 Q508.3125,228.9063 509,229.9844 Q509.6875,231.0469 511.0313,231.0469 Q511.6563,231.0469 512.25,230.7813 Q512.8438,230.5 513.4688,229.9219 L513.4688,232.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="524.5" y="231.1543">D</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="541.5" y="208"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.5" y="220.1387">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="496.5" x2="547.5" y1="243" y2="243"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="496.5" x2="547.5" y1="251" y2="251"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="48" id="C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="474.5" y="211"/>
+      <ellipse cx="489.5" cy="227" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M492.4688,232.6406 Q491.8906,232.9375 491.25,233.0781 Q490.6094,233.2344 489.9063,233.2344 Q487.4063,233.2344 486.0781,231.5938 Q484.7656,229.9375 484.7656,226.8125 Q484.7656,223.6875 486.0781,222.0313 Q487.4063,220.375 489.9063,220.375 Q490.6094,220.375 491.25,220.5313 Q491.9063,220.6875 492.4688,220.9844 L492.4688,223.7031 Q491.8438,223.125 491.25,222.8594 Q490.6563,222.5781 490.0313,222.5781 Q488.6875,222.5781 488,223.6563 Q487.3125,224.7188 487.3125,226.8125 Q487.3125,228.9063 488,229.9844 Q488.6875,231.0469 490.0313,231.0469 Q490.6563,231.0469 491.25,230.7813 Q491.8438,230.5 492.4688,229.9219 L492.4688,232.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="503.5" y="231.1543">D</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="520.5" y="208"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="521.5" y="220.1387">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="475.5" x2="526.5" y1="243" y2="243"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="475.5" x2="526.5" y1="251" y2="251"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="502" y="548"/>
-      <ellipse cx="517" cy="566.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M519.9688,572.6094 Q519.3906,572.9063 518.75,573.0469 Q518.1094,573.2031 517.4063,573.2031 Q514.9063,573.2031 513.5781,571.5625 Q512.2656,569.9063 512.2656,566.7813 Q512.2656,563.6563 513.5781,562 Q514.9063,560.3438 517.4063,560.3438 Q518.1094,560.3438 518.75,560.5 Q519.4063,560.6563 519.9688,560.9531 L519.9688,563.6719 Q519.3438,563.0938 518.75,562.8281 Q518.1563,562.5469 517.5313,562.5469 Q516.1875,562.5469 515.5,563.625 Q514.8125,564.6875 514.8125,566.7813 Q514.8125,568.875 515.5,569.9531 Q516.1875,571.0156 517.5313,571.0156 Q518.1563,571.0156 518.75,570.75 Q519.3438,570.4688 519.9688,569.8906 L519.9688,572.6094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="529" y="564.1387">«concept»</text>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="532" y="578.1074">bconcept</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="600" y="545"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="601" y="557.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="503" x2="605" y1="585.9375" y2="585.9375"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="508" y="600.1479">(T t)</text>
-      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="503" x2="605" y1="606.7422" y2="606.7422"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="508" y="620.9526">T{}</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="508" y="633.7573">t.b()</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/concepts/concepts.h#L7" target="_top" title="bconcept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/concepts/concepts.h#L7" xlink:show="new" xlink:title="bconcept" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="92.3516" id="C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="481" y="548"/>
+      <ellipse cx="496" cy="566.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M498.9688,572.6094 Q498.3906,572.9063 497.75,573.0469 Q497.1094,573.2031 496.4063,573.2031 Q493.9063,573.2031 492.5781,571.5625 Q491.2656,569.9063 491.2656,566.7813 Q491.2656,563.6563 492.5781,562 Q493.9063,560.3438 496.4063,560.3438 Q497.1094,560.3438 497.75,560.5 Q498.4063,560.6563 498.9688,560.9531 L498.9688,563.6719 Q498.3438,563.0938 497.75,562.8281 Q497.1563,562.5469 496.5313,562.5469 Q495.1875,562.5469 494.5,563.625 Q493.8125,564.6875 493.8125,566.7813 Q493.8125,568.875 494.5,569.9531 Q495.1875,571.0156 496.5313,571.0156 Q497.1563,571.0156 497.75,570.75 Q498.3438,570.4688 498.9688,569.8906 L498.9688,572.6094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="508" y="564.1387">«concept»</text>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="511" y="578.1074">bconcept</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="579" y="545"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="580" y="557.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="482" x2="584" y1="585.9375" y2="585.9375"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="487" y="600.1479">(T t)</text>
+      <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="482" x2="584" y1="606.7422" y2="606.7422"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="487" y="620.9526">T{}</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="487" y="633.7573">t.b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1py8f6f4pn4bc)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="394.5" y="8"/>
-      <ellipse cx="427.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M430.0188,29.6406 Q429.4406,29.9375 428.8,30.0781 Q428.1594,30.2344 427.4563,30.2344 Q424.9563,30.2344 423.6281,28.5938 Q422.3156,26.9375 422.3156,23.8125 Q422.3156,20.6875 423.6281,19.0313 Q424.9563,17.375 427.4563,17.375 Q428.1594,17.375 428.8,17.5313 Q429.4563,17.6875 430.0188,17.9844 L430.0188,20.7031 Q429.3938,20.125 428.8,19.8594 Q428.2063,19.5781 427.5813,19.5781 Q426.2375,19.5781 425.55,20.6563 Q424.8625,21.7188 424.8625,23.8125 Q424.8625,25.9063 425.55,26.9844 Q426.2375,28.0469 427.5813,28.0469 Q428.2063,28.0469 428.8,27.7813 Q429.3938,27.5 430.0188,26.9219 L430.0188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="444.95" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="472.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="472.5" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L6" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L6" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl5bb4p75fbnl)" height="86.4141" id="C_0001082111961413727438" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="373.5" y="8"/>
+      <ellipse cx="406.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M409.0188,29.6406 Q408.4406,29.9375 407.8,30.0781 Q407.1594,30.2344 406.4563,30.2344 Q403.9563,30.2344 402.6281,28.5938 Q401.3156,26.9375 401.3156,23.8125 Q401.3156,20.6875 402.6281,19.0313 Q403.9563,17.375 406.4563,17.375 Q407.1594,17.375 407.8,17.5313 Q408.4563,17.6875 409.0188,17.9844 L409.0188,20.7031 Q408.3938,20.125 407.8,19.8594 Q407.2063,19.5781 406.5813,19.5781 Q405.2375,19.5781 404.55,20.6563 Q403.8625,21.7188 403.8625,23.8125 Q403.8625,25.9063 404.55,26.9844 Q405.2375,28.0469 406.5813,28.0469 Q407.2063,28.0469 407.8,27.7813 Q408.3938,27.5 409.0188,26.9219 L409.0188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="423.95" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="451.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="451.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="54"/>
-      <ellipse cx="405.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="54"/>
+      <ellipse cx="384.5" cy="59" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="414.5" y="62.2104">a : A *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L7" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L7" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="393.5" y="62.2104">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="66.8047"/>
-      <ellipse cx="405.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="66.8047"/>
+      <ellipse cx="384.5" cy="71.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="414.5" y="75.0151">c : C&lt;B&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L8" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L8" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="393.5" y="75.0151">c : C&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="79.6094"/>
-      <ellipse cx="405.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="379.5" y="79.6094"/>
+      <ellipse cx="384.5" cy="84.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="414.5" y="87.8198">d : D&lt;B&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L9" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L9" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="393.5" y="87.8198">d : D&lt;B&gt;</text>
     </a>
-    <path d="M190.81,290.32 C188.41,296.25 186.09,302.23 184,308 C178.28,323.8 172.83,341.46 168.34,356.98 " fill="none" id="C_0001178194542408300737&lt;-C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="195.8,278.31,189.8041,282.3161,191.1959,289.3916,197.1918,285.3855,195.8,278.31" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="190" cy="317.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="197" y="321.0669">abc</text>
-    <path d="M154.99,287.06 C139.85,301.22 124.18,317.09 111,333 C104.81,340.48 98.64,348.8 92.94,356.94 " fill="none" id="C_0001178194542408300737&lt;-C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="164.82,278.02,157.6958,279.1363,155.9862,286.1418,163.1104,285.0255,164.82,278.02" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="138" cy="317.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="145" y="321.0669">xyz</text>
-    <path d="M230.35,278.4 C240.91,307.58 254.65,345.53 263.86,371 " fill="none" id="C_0001178194542408300737-&gt;C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="265.65,375.92,266.3503,366.0961,263.9493,371.2181,258.8273,368.8172,265.65,375.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="252" cy="317.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="259" y="321.0669">pimpl</text>
-    <path d="M656.01,618.07 C646.74,631.82 634.3,649.39 622,664 C614.49,672.92 606.03,682.06 597.71,690.63 " fill="none" id="C_0000580575003920044707-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="602.62,695.62,583.54,704.83,592.71,685.73,602.62,695.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M648.99,437.11 C630.68,467.16 604.44,510.23 584.17,543.49 " fill="none" id="C_0001719752929087851944-&gt;C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="581.48,547.91,589.5763,542.302,584.0797,543.639,582.7427,538.1424,581.48,547.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="620" y="493.0669">T</text>
-    <path d="M671,450.34 C671,488.73 671,540.27 671,569.73 " fill="none" id="C_0001719752929087851944&lt;-C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="671,437.11,667,443.11,671,449.11,675,443.11,671,437.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="672" y="493.0669">+c</text>
-    <path d="M445.01,259.01 C456.77,283.58 475.7,323.15 490.45,353.96 " fill="none" id="C_0001373403346245688670-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="492.78,358.83,492.5087,348.9849,490.6242,354.3186,485.2905,352.4341,492.78,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M430.78,259.27 C425.48,301.79 416.59,394.76 428,472 C441.03,560.18 440.36,587.43 486,664 C492.45,674.83 500.99,685.21 509.82,694.46 " fill="none" id="C_0001373403346245688670-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="514.71,689.46,524.16,708.43,504.95,699.49,514.71,689.46" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M520.59,259.01 C519.09,283.48 516.67,322.82 514.79,353.58 " fill="none" id="C_0002024276012622729482-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="514.46,358.83,518.9918,350.0857,514.7595,353.839,511.0062,349.6066,514.46,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M543.03,259.01 C564.07,282.02 597.14,318.2 624.39,348.01 " fill="none" id="C_0002024276012622729482-&gt;C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="629.68,343.43,638.01,362.91,619.35,352.87,629.68,343.43" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M394.34,84.96 C359.49,113.92 308.45,156.33 269.73,188.52 " fill="none" id="C_0001082111961413727438-&gt;C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="265.54,192,275.0206,189.332,269.3881,188.8075,269.9126,183.175,265.54,192" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="345" y="137.0669">+a</text>
-    <path d="M434,107.53 C434,142.21 434,185.04 434,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="434,94.21,430,100.21,434,106.21,438,100.21,434,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="435" y="137.0669">+c</text>
-    <path d="M460.19,106.16 C477.07,141.07 498.16,184.7 510.83,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="454.41,94.21,453.4243,101.3534,459.6391,105.0107,460.6248,97.8673,454.41,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="476" y="137.0669">+d</text>
+    <path d="M174.62,290.21 C172.09,296.1 169.81,302.1 168,308 C163.24,323.52 160.53,341.12 158.99,356.68 " fill="none" id="C_0001178194542408300737&lt;-C_0002145362985538918973" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="180.11,278.35,173.9609,282.1168,175.0729,289.2417,181.222,285.4748,180.11,278.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="174" cy="317.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="321.0669">abc</text>
+    <path d="M140.91,287.09 C133.86,293.8 127.06,300.85 121,308 C108.47,322.79 96.97,340.75 87.75,356.8 " fill="none" id="C_0001178194542408300737&lt;-C_0001435940218810141944" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="150.61,278.16,143.4867,279.2821,141.7828,286.289,148.906,285.1669,150.61,278.16" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="127" cy="317.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="321.0669">xyz</text>
+    <path d="M217.49,278.4 C226.08,307.58 237.25,345.53 244.75,371 " fill="none" id="C_0001178194542408300737-&gt;C_0000674757414308736755" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="246.2,375.92,247.4932,366.1564,244.7869,371.1239,239.8194,368.4175,246.2,375.92" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="237" cy="317.0664" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="244" y="321.0669">pimpl</text>
+    <path d="M635.01,618.07 C625.74,631.82 613.3,649.39 601,664 C593.49,672.92 585.03,682.06 576.71,690.63 " fill="none" id="C_0000580575003920044707-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="581.62,695.62,562.54,704.83,571.71,685.73,581.62,695.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M627.99,437.11 C609.68,467.16 583.44,510.23 563.17,543.49 " fill="none" id="C_0001719752929087851944-&gt;C_0001325475407133721370" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="560.48,547.91,568.5763,542.302,563.0797,543.639,561.7427,538.1424,560.48,547.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="7" x="599" y="493.0669">T</text>
+    <path d="M650,450.34 C650,488.73 650,540.27 650,569.73 " fill="none" id="C_0001719752929087851944&lt;-C_0000580575003920044707" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="650,437.11,646,443.11,650,449.11,654,443.11,650,437.11" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="651" y="493.0669">+c</text>
+    <path d="M424.01,259.01 C435.77,283.58 454.7,323.15 469.45,353.96 " fill="none" id="C_0001373403346245688670-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="471.78,358.83,471.5087,348.9849,469.6242,354.3186,464.2905,352.4341,471.78,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M409.78,259.27 C404.48,301.79 395.59,394.76 407,472 C420.03,560.18 419.36,587.43 465,664 C471.45,674.83 479.99,685.21 488.82,694.46 " fill="none" id="C_0001373403346245688670-&gt;C_0001157378014768957235" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="493.71,689.46,503.16,708.43,483.95,699.49,493.71,689.46" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M499.59,259.01 C498.09,283.48 495.67,322.82 493.79,353.58 " fill="none" id="C_0002024276012622729482-&gt;C_0001651810571114530033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="493.46,358.83,497.9918,350.0857,493.7595,353.839,490.0062,349.6066,493.46,358.83" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M522.03,259.01 C543.07,282.02 576.14,318.2 603.39,348.01 " fill="none" id="C_0002024276012622729482-&gt;C_0001719752929087851944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="608.68,343.43,617.01,362.91,598.35,352.87,608.68,343.43" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M373.39,86.66 C340.41,115.52 293.18,156.84 257.13,188.38 " fill="none" id="C_0001082111961413727438-&gt;C_0001178194542408300737" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="253.24,191.79,262.6417,188.8561,256.9967,188.4904,257.3624,182.8454,253.24,191.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="328" y="137.0669">+a</text>
+    <path d="M413,107.53 C413,142.21 413,185.04 413,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0001373403346245688670" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="413,94.21,409,100.21,413,106.21,417,100.21,413,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="414" y="137.0669">+c</text>
+    <path d="M439.19,106.16 C456.07,141.07 477.16,184.7 489.83,210.9 " fill="none" id="C_0001082111961413727438&lt;-C_0002024276012622729482" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="433.41,94.21,432.4243,101.3534,438.6391,105.0107,439.6248,97.8673,433.41,94.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="455" y="137.0669">+d</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg
index 239792a4..dbc1b14b 100644
--- a/docs/test_cases/t00065_class_mermaid.svg
+++ b/docs/test_cases/t00065_class_mermaid.svg
@@ -210,7 +210,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/submodule1a/submodule1a.h#L6">
+        <a transform="translate(407.4453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/submodule1a/submodule1a.h#L6">
           <g title="AImpl" id="classId-C_0000674757414308736755-0" class="node default clickable">
             <rect height="57" width="111.890625" y="-28.5" x="-55.9453125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="55.9453125" x1="-55.9453125" class="divider"/>
@@ -229,7 +229,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L8">
+        <a transform="translate(68.875, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L8">
           <g title="ABC" id="classId-C_0002145362985538918973-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -263,7 +263,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L10">
+        <a transform="translate(240.625, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L10">
           <g title="XYZ" id="classId-C_0001435940218810141944-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -297,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module1/module1.h#L12">
+        <a transform="translate(240.625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module1/module1.h#L12">
           <g title="A" id="classId-C_0001178194542408300737-3" class="node default clickable">
             <rect height="123" width="163.953125" y="-61.5" x="-81.9765625" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="81.9765625" x1="-81.9765625" class="divider"/>
@@ -331,11 +331,11 @@
             </g>
           </g>
         </a>
-        <a transform="translate(794.4140625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/concepts/concepts.h#L7">
+        <a transform="translate(794.4140625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/concepts/concepts.h#L7">
           <g title="bconcept" id="classId-C_0001325475407133721370-4" class="node default clickable">
             <rect height="145" width="114.578125" y="-72.5" x="-57.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="57.2890625" x1="-57.2890625" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="57.2890625" x1="-57.2890625" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="57.2890625" x1="-57.2890625" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -65)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -352,20 +352,20 @@
                   <span class="nodeLabel">"T{}"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -49.7890625, 13)" height="18" width="39.8125">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"t.b()"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -49.7890625, 47)" height="18" width="40.390625">
+              <foreignObject transform="translate( -49.7890625, 25)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -49.7890625, 47)" height="18" width="34.125">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"t.b()</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(588.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L7">
+        <a transform="translate(588.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L7">
           <g title="B" id="classId-C_0001651810571114530033-5" class="node default clickable">
             <rect height="101" width="149.734375" y="-50.5" x="-74.8671875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="74.8671875" x1="-74.8671875" class="divider"/>
@@ -394,7 +394,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(814.11328125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(814.11328125, 837.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001157378014768957235-6" class="node default clickable">
             <rect height="79" width="55.015625" y="-39.5" x="-27.5078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="27.5078125" x1="-27.5078125" class="divider"/>
@@ -418,7 +418,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(934.1015625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(934.1015625, 675.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0000580575003920044707-7" class="node default clickable">
             <rect height="57" width="64.796875" y="-28.5" x="-32.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -437,7 +437,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(864.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(864.2578125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0001719752929087851944-8" class="node default clickable">
             <rect height="101" width="130.578125" y="-50.5" x="-65.2890625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.2890625" x1="-65.2890625" class="divider"/>
@@ -466,7 +466,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(643.19140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L12">
+        <a transform="translate(643.19140625, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L12">
           <g title="C" id="classId-C_0001373403346245688670-9" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -485,7 +485,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(854.2578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/module2/module2.h#L16">
+        <a transform="translate(854.2578125, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/module2/module2.h#L16">
           <g title="D" id="classId-C_0002024276012622729482-10" class="node default clickable">
             <rect height="57" width="56.796875" y="-28.5" x="-28.3984375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="28.3984375" x1="-28.3984375" class="divider"/>
@@ -504,7 +504,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(643.19140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00065/t00065.cc#L6">
+        <a transform="translate(643.19140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00065/t00065.cc#L6">
           <g title="R" id="classId-C_0001082111961413727438-11" class="node default clickable">
             <rect height="123" width="87.5" y="-61.5" x="-43.75" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="43.75" x1="-43.75" class="divider"/>
diff --git a/docs/test_cases/t00066.md b/docs/test_cases/t00066.md
index b0335cc5..cf124f52 100644
--- a/docs/test_cases/t00066.md
+++ b/docs/test_cases/t00066.md
@@ -229,6 +229,7 @@ int A::static_int = 1;
       "methods": [
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -251,10 +252,12 @@ int A::static_int = 1;
             "line": 9,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -282,10 +285,12 @@ int A::static_int = 1;
             "line": 10,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -313,10 +318,12 @@ int A::static_int = 1;
             "line": 14,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -344,10 +351,12 @@ int A::static_int = 1;
             "line": 15,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "~A",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -370,10 +379,12 @@ int A::static_int = 1;
             "line": 16,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "basic_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -396,10 +407,12 @@ int A::static_int = 1;
             "line": 18,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "static_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -422,10 +435,12 @@ int A::static_int = 1;
             "line": 19,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "const_method",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -448,10 +463,12 @@ int A::static_int = 1;
             "line": 20,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "auto_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -474,10 +491,12 @@ int A::static_int = 1;
             "line": 21,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "operator++",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -500,10 +519,12 @@ int A::static_int = 1;
             "line": 23,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "A &"
         },
         {
           "access": "public",
+          "display_name": "operator=",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -531,10 +552,12 @@ int A::static_int = 1;
             "line": 29,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "A &"
         },
         {
           "access": "public",
+          "display_name": "operator=",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -562,10 +585,12 @@ int A::static_int = 1;
             "line": 30,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "A &"
         },
         {
           "access": "public",
+          "display_name": "size",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -588,10 +613,12 @@ int A::static_int = 1;
             "line": 32,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "std::size_t"
         },
         {
           "access": "public",
+          "display_name": "double_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -619,10 +646,12 @@ int A::static_int = 1;
             "line": 34,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "sum",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -654,10 +683,12 @@ int A::static_int = 1;
             "line": 35,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "default_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -686,10 +717,12 @@ int A::static_int = 1;
             "line": 37,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "default_string",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -722,10 +755,12 @@ int A::static_int = 1;
             "line": 38,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "public",
+          "display_name": "create_from_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -753,10 +788,12 @@ int A::static_int = 1;
             "line": 43,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "A"
         },
         {
           "access": "protected",
+          "display_name": "protected_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -779,10 +816,12 @@ int A::static_int = 1;
             "line": 51,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "private",
+          "display_name": "private_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -805,6 +844,7 @@ int A::static_int = 1;
             "line": 60,
             "translation_unit": "t00066.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg
index 67b9f7a9..9229314b 100644
--- a/docs/test_cases/t00066_class.svg
+++ b/docs/test_cases/t00066_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="450px" preserveAspectRatio="none" style="width:347px;height:450px;" version="1.1" viewBox="0 0 347 450" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1snzho0ob6fot" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1qm1t2v9kcmal" 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,222 +9,222 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1snzho0ob6fot)" height="432.1406" id="C_0001899957281758233935" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qm1t2v9kcmal)" height="432.1406" id="C_0001899957281758233935" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L45" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L45" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L45" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L45" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L53" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L53" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L53" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L53" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L62" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L62" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L62" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L62" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L63" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L63" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L46" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L46" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L46" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L46" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L47" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L47" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L47" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L47" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L48" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L48" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L48" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L48" 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"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#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="13" y="168.2422"/>
       <ellipse cx="18" cy="173.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="27" y="176.4526">A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L10" 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="181.0469"/>
       <ellipse cx="18" cy="186.0469" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="71" x="27" y="189.2573">A(int i) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L14" 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="193.8516"/>
       <ellipse cx="18" cy="198.8516" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="137" x="27" y="202.062">A(A &amp;&amp;) = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.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="13" y="206.6563"/>
       <ellipse cx="18" cy="211.6563" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="165" x="27" y="214.8667">A(const A &amp;) = deleted : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L16" 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="219.4609"/>
       <ellipse cx="18" cy="224.4609" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L16" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L16" xlink:show="new" xlink:title="~A" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="27" y="227.6714">~A() = default : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="232.2656"/>
       <ellipse cx="18" cy="237.2656" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L18" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L18" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="240.4761">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="245.0703"/>
       <ellipse cx="18" cy="250.0703" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L19" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L19" xlink:show="new" xlink:title="static_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="114" x="27" y="253.2808">static_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="257.875"/>
       <ellipse cx="18" cy="262.875" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L20" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L20" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="266.0854">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="270.6797"/>
       <ellipse cx="18" cy="275.6797" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L21" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L21" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="278.8901">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="283.4844"/>
       <ellipse cx="18" cy="288.4844" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L23" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L23" xlink:show="new" xlink:title="operator++" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="291.6948">operator++() : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="296.2891"/>
       <ellipse cx="18" cy="301.2891" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L29" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L29" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="27" y="304.4995">operator=(A &amp;&amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="309.0938"/>
       <ellipse cx="18" cy="314.0938" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="209" x="27" y="317.3042">operator=(A &amp; other) noexcept : A &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="321.8984"/>
       <ellipse cx="18" cy="326.8984" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L32" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L32" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="330.1089">size() const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="334.7031"/>
       <ellipse cx="18" cy="339.7031" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L34" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L34" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="342.9136">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="347.5078"/>
       <ellipse cx="18" cy="352.5078" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L35" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L35" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="355.7183">sum(const double a, const double b) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="360.3125"/>
       <ellipse cx="18" cy="365.3125" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L37" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L37" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="368.5229">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
       <ellipse cx="18" cy="378.1172" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L38" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L38" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="381.3276">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="385.9219"/>
       <ellipse cx="18" cy="390.9219" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L43" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L43" xlink:show="new" xlink:title="create_from_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="137" x="27" y="394.1323">create_from_int(int i) : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="398.7266"/>
       <polygon fill="#FFFF44" points="18,398.7266,22,402.7266,18,406.7266,14,402.7266" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L51" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L51" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="406.937">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="411.5313"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="413.5313"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L60" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L60" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="419.7417">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L55" 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="424.3359"/>
       <polygon fill="#FFFF44" points="18,424.3359,22,428.3359,18,432.3359,14,428.3359" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L55" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L55" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L55" 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="432.5464">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00066_class_mermaid.svg b/docs/test_cases/t00066_class_mermaid.svg
index 81afb0fc..7a90af17 100644
--- a/docs/test_cases/t00066_class_mermaid.svg
+++ b/docs/test_cases/t00066_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00066/t00066.cc#L7">
+        <a transform="translate(200.375, 366.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00066/t00066.cc#L7">
           <g title="A" id="classId-C_0001899957281758233935-0" class="node default clickable">
             <rect height="717" width="384.75" y="-358.5" x="-192.375" class="outer title-state"/>
             <line y2="-328.5" y1="-328.5" x2="192.375" x1="-192.375" class="divider"/>
diff --git a/docs/test_cases/t00067.md b/docs/test_cases/t00067.md
index caf5131f..43f43fc0 100644
--- a/docs/test_cases/t00067.md
+++ b/docs/test_cases/t00067.md
@@ -232,6 +232,7 @@ int A::static_int = 1;
       "methods": [
         {
           "access": "public",
+          "display_name": "basic_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -254,10 +255,12 @@ int A::static_int = 1;
             "line": 17,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "const_method",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -280,10 +283,12 @@ int A::static_int = 1;
             "line": 19,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "auto_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -306,10 +311,12 @@ int A::static_int = 1;
             "line": 20,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "size",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -332,10 +339,12 @@ int A::static_int = 1;
             "line": 31,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "std::size_t"
         },
         {
           "access": "public",
+          "display_name": "double_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -363,10 +372,12 @@ int A::static_int = 1;
             "line": 33,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "sum",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -398,10 +409,12 @@ int A::static_int = 1;
             "line": 34,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "default_int",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -430,10 +443,12 @@ int A::static_int = 1;
             "line": 36,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "int"
         },
         {
           "access": "public",
+          "display_name": "default_string",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -466,10 +481,12 @@ int A::static_int = 1;
             "line": 37,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "std::string"
         },
         {
           "access": "protected",
+          "display_name": "protected_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -492,10 +509,12 @@ int A::static_int = 1;
             "line": 50,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "private",
+          "display_name": "private_method",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -518,6 +537,7 @@ int A::static_int = 1;
             "line": 59,
             "translation_unit": "t00067.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg
index 8354db62..ce454df6 100644
--- a/docs/test_cases/t00067_class.svg
+++ b/docs/test_cases/t00067_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="322px" preserveAspectRatio="none" style="width:347px;height:322px;" version="1.1" viewBox="0 0 347 322" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lr4yx45zvdq9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7gjsnewmldkr" 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,152 +9,152 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lr4yx45zvdq9)" height="304.0938" id="C_0000541140581420098839" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7gjsnewmldkr)" height="304.0938" id="C_0000541140581420098839" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L20" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L20" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="27" y="53.2104">auto_method() : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <ellipse cx="18" cy="62.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L17" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L17" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="27" y="66.0151">basic_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <ellipse cx="18" cy="75.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L19" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L19" xlink:show="new" xlink:title="const_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="27" y="78.8198">const_method() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <ellipse cx="18" cy="88.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L36" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L36" xlink:show="new" xlink:title="default_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="27" y="91.6245">default_int(int i = 12) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <ellipse cx="18" cy="101.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L37" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L37" xlink:show="new" xlink:title="default_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="303" x="27" y="104.4292">default_string(int i, std::string s = "abc") : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <ellipse cx="18" cy="114.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L33" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L33" xlink:show="new" xlink:title="double_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="27" y="117.2339">double_int(const int i) : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="123.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L59" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L59" xlink:show="new" xlink:title="private_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="130.0386">private_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <polygon fill="#FFFF44" points="18,134.6328,22,138.6328,18,142.6328,14,138.6328" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L50" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L50" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="142.8433">protected_method() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L31" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L31" xlink:show="new" xlink:title="size" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="27" y="155.6479">size() const : std::size_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="160.2422"/>
       <ellipse cx="18" cy="165.2422" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L34" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L34" xlink:show="new" xlink:title="sum" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="235" x="27" y="168.4526">sum(const double a, const double b) : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="175.0469" y2="175.0469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" 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="181.0469"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="183.0469"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" 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="189.2573">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L47" 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="193.8516"/>
       <ellipse cx="18" cy="198.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L47" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L47" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L47" 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="202.062">auto_member : const unsigned long</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" 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="206.6563"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="208.6563"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" 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="214.8667">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" 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="219.4609"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="221.4609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L62" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L62" 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="227.6714">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L54" 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="232.2656"/>
       <polygon fill="#FFFF44" points="18,232.2656,22,236.2656,18,240.2656,14,236.2656" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L54" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L54" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L54" 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="240.4761">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L61" 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="245.0703"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="247.0703"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L61" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L61" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L61" 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="253.2808">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L52" 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="257.875"/>
       <polygon fill="none" points="18,257.875,22,261.875,18,265.875,14,261.875" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L52" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L52" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L52" 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="266.0854">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L44" 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="270.6797"/>
       <ellipse cx="18" cy="275.6797" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L44" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L44" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L44" 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="278.8901">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L46" 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="283.4844"/>
       <ellipse cx="18" cy="288.4844" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L46" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L46" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L46" 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="291.6948">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L45" 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="296.2891"/>
       <ellipse cx="18" cy="301.2891" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L45" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L45" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L45" 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="304.4995">static_int : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00067_class_mermaid.svg b/docs/test_cases/t00067_class_mermaid.svg
index b9c2272c..30694236 100644
--- a/docs/test_cases/t00067_class_mermaid.svg
+++ b/docs/test_cases/t00067_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00067/t00067.cc#L6">
+        <a transform="translate(200.375, 256.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00067/t00067.cc#L6">
           <g title="A" id="classId-C_0000541140581420098839-0" class="node default clickable">
             <rect height="497" width="384.75" y="-248.5" x="-192.375" class="outer title-state"/>
             <line y2="-218.5" y1="-218.5" x2="192.375" x1="-192.375" class="divider"/>
diff --git a/docs/test_cases/t00068_r0_class.svg b/docs/test_cases/t00068_r0_class.svg
index d88cbe7e..fa29620b 100644
--- a/docs/test_cases/t00068_r0_class.svg
+++ b/docs/test_cases/t00068_r0_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="112px" preserveAspectRatio="none" style="width:222px;height:112px;" version="1.1" viewBox="0 0 222 112" width="222px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f17ah3c5r3pl2b" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1d0rrhcqnk3j5" 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"/>
@@ -10,26 +10,26 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="2" y="16.708">AAA context of radius 0</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17ah3c5r3pl2b)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="56.5" y="27.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1d0rrhcqnk3j5)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="56.5" y="27.9531"/>
       <ellipse cx="90.85" cy="43.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M93.8188,49.5938 Q93.2406,49.8906 92.6,50.0313 Q91.9594,50.1875 91.2563,50.1875 Q88.7563,50.1875 87.4281,48.5469 Q86.1156,46.8906 86.1156,43.7656 Q86.1156,40.6406 87.4281,38.9844 Q88.7563,37.3281 91.2563,37.3281 Q91.9594,37.3281 92.6,37.4844 Q93.2563,37.6406 93.8188,37.9375 L93.8188,40.6563 Q93.1938,40.0781 92.6,39.8125 Q92.0063,39.5313 91.3813,39.5313 Q90.0375,39.5313 89.35,40.6094 Q88.6625,41.6719 88.6625,43.7656 Q88.6625,45.8594 89.35,46.9375 Q90.0375,48 91.3813,48 Q92.0063,48 92.6,47.7344 Q93.1938,47.4531 93.8188,46.875 L93.8188,49.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="109.15" y="48.1074">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="59.9531" y2="59.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="57.5" x2="154.5" y1="67.9531" y2="67.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="73.9531"/>
       <ellipse cx="67.5" cy="78.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="76.5" y="82.1636">akind : AKind</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="62.5" y="86.7578"/>
       <ellipse cx="67.5" cy="91.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="76.5" y="94.9683">bb : BB *</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00068_r0_class_mermaid.svg b/docs/test_cases/t00068_r0_class_mermaid.svg
index eb2dfa19..53857e80 100644
--- a/docs/test_cases/t00068_r0_class_mermaid.svg
+++ b/docs/test_cases/t00068_r0_class_mermaid.svg
@@ -53,7 +53,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19">
+        <a transform="translate(66.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-0" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
diff --git a/docs/test_cases/t00068_r1_class.svg b/docs/test_cases/t00068_r1_class.svg
index aa51840e..3c0b229a 100644
--- a/docs/test_cases/t00068_r1_class.svg
+++ b/docs/test_cases/t00068_r1_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="415px" preserveAspectRatio="none" style="width:250px;height:415px;" version="1.1" viewBox="0 0 250 415" width="250px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="faqobnnaukzhf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgg60ht7xowif" 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"/>
@@ -10,23 +10,23 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="24.5" y="16.708">AAA context of radius 1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faqobnnaukzhf)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="330.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgg60ht7xowif)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="330.4531"/>
       <ellipse cx="59.75" cy="346.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M62.7188,352.0938 Q62.1406,352.3906 61.5,352.5313 Q60.8594,352.6875 60.1563,352.6875 Q57.6563,352.6875 56.3281,351.0469 Q55.0156,349.3906 55.0156,346.2656 Q55.0156,343.1406 56.3281,341.4844 Q57.6563,339.8281 60.1563,339.8281 Q60.8594,339.8281 61.5,339.9844 Q62.1563,340.1406 62.7188,340.4375 L62.7188,343.1563 Q62.0938,342.5781 61.5,342.3125 Q60.9063,342.0313 60.2813,342.0313 Q58.9375,342.0313 58.25,343.1094 Q57.5625,344.1719 57.5625,346.2656 Q57.5625,348.3594 58.25,349.4375 Q58.9375,350.5 60.2813,350.5 Q60.9063,350.5 61.5,350.2344 Q62.0938,349.9531 62.7188,349.375 L62.7188,352.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="350.6074">BB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="362.4531" y2="362.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="370.4531" y2="370.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" 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="376.4531"/>
       <ellipse cx="17" cy="381.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="384.6636">b : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faqobnnaukzhf)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="317.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgg60ht7xowif)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="317.9531"/>
       <ellipse cx="188" cy="333.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.1094,339.9531 L184.3906,339.9531 L184.3906,327.5625 L192.1094,327.5625 L192.1094,329.7188 L186.8438,329.7188 L186.8438,332.3906 L191.6094,332.3906 L191.6094,334.5469 L186.8438,334.5469 L186.8438,337.7969 L192.1094,337.7969 L192.1094,339.9531 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="338.1074">AKind</text>
@@ -36,49 +36,49 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="389.7729">ThreeA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="396.3672" y2="396.3672"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faqobnnaukzhf)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="35.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgg60ht7xowif)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="35.4531"/>
       <ellipse cx="78" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M80.9688,57.0938 Q80.3906,57.3906 79.75,57.5313 Q79.1094,57.6875 78.4063,57.6875 Q75.9063,57.6875 74.5781,56.0469 Q73.2656,54.3906 73.2656,51.2656 Q73.2656,48.1406 74.5781,46.4844 Q75.9063,44.8281 78.4063,44.8281 Q79.1094,44.8281 79.75,44.9844 Q80.4063,45.1406 80.9688,45.4375 L80.9688,48.1563 Q80.3438,47.5781 79.75,47.3125 Q79.1563,47.0313 78.5313,47.0313 Q77.1875,47.0313 76.5,48.1094 Q75.8125,49.1719 75.8125,51.2656 Q75.8125,53.3594 76.5,54.4375 Q77.1875,55.5 78.5313,55.5 Q79.1563,55.5 79.75,55.2344 Q80.3438,54.9531 80.9688,54.375 L80.9688,57.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="55.6074">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="67.4531" y2="67.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="75.4531" y2="75.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faqobnnaukzhf)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="166.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgg60ht7xowif)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="166.9531"/>
       <ellipse cx="123.85" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M126.8188,188.5938 Q126.2406,188.8906 125.6,189.0313 Q124.9594,189.1875 124.2563,189.1875 Q121.7563,189.1875 120.4281,187.5469 Q119.1156,185.8906 119.1156,182.7656 Q119.1156,179.6406 120.4281,177.9844 Q121.7563,176.3281 124.2563,176.3281 Q124.9594,176.3281 125.6,176.4844 Q126.2563,176.6406 126.8188,176.9375 L126.8188,179.6563 Q126.1938,179.0781 125.6,178.8125 Q125.0063,178.5313 124.3813,178.5313 Q123.0375,178.5313 122.35,179.6094 Q121.6625,180.6719 121.6625,182.7656 Q121.6625,184.8594 122.35,185.9375 Q123.0375,187 124.3813,187 Q125.0063,187 125.6,186.7344 Q126.1938,186.4531 126.8188,185.875 L126.8188,188.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="187.1074">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="198.9531" y2="198.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="206.9531" y2="206.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="212.9531"/>
       <ellipse cx="100.5" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="221.1636">akind : AKind</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="225.7578"/>
       <ellipse cx="100.5" cy="230.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="233.9683">bb : BB *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#faqobnnaukzhf)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="146" y="28.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgg60ht7xowif)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="146" y="28.9531"/>
       <ellipse cx="183.5" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.4688,50.5938 Q185.8906,50.8906 185.25,51.0313 Q184.6094,51.1875 183.9063,51.1875 Q181.4063,51.1875 180.0781,49.5469 Q178.7656,47.8906 178.7656,44.7656 Q178.7656,41.6406 180.0781,39.9844 Q181.4063,38.3281 183.9063,38.3281 Q184.6094,38.3281 185.25,38.4844 Q185.9063,38.6406 186.4688,38.9375 L186.4688,41.6563 Q185.8438,41.0781 185.25,40.8125 Q184.6563,40.5313 184.0313,40.5313 Q182.6875,40.5313 182,41.6094 Q181.3125,42.6719 181.3125,44.7656 Q181.3125,46.8594 182,47.9375 Q182.6875,49 184.0313,49 Q184.6563,49 185.25,48.7344 Q185.8438,48.4531 186.4688,47.875 L186.4688,50.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="202.5" y="49.1074">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="60.9531" y2="60.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="147" x2="235" y1="68.9531" y2="68.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="152" y="74.9531"/>
       <ellipse cx="157" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="166" y="83.1636">aaa : AAA *</text>
     </a>
     <path d="M123.29,241.2931 C112.3,266.7131 97.72,300.4531 86.91,325.4531 " fill="none" id="C_0001484819281509619918-&gt;C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00068_r1_class_mermaid.svg b/docs/test_cases/t00068_r1_class_mermaid.svg
index 745b011d..a497beb5 100644
--- a/docs/test_cases/t00068_r1_class_mermaid.svg
+++ b/docs/test_cases/t00068_r1_class_mermaid.svg
@@ -101,7 +101,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-0" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -125,7 +125,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 396.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-1" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -159,7 +159,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L17">
+        <a transform="translate(117.2734375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-2" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -178,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-3" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L24">
+        <a transform="translate(234.2265625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-4" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
diff --git a/docs/test_cases/t00068_r2_class.svg b/docs/test_cases/t00068_r2_class.svg
index cd4a1c8e..4f4c40ef 100644
--- a/docs/test_cases/t00068_r2_class.svg
+++ b/docs/test_cases/t00068_r2_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="677px" preserveAspectRatio="none" style="width:301px;height:677px;" version="1.1" viewBox="0 0 301 677" width="301px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f739i5uhx1ctd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1361qkojdlwn" 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"/>
@@ -10,31 +10,31 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="208" x="50" y="16.708">AAA context of radius 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="48" id="C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="52" y="618.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="48" id="C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="52" y="618.9531"/>
       <ellipse cx="67" cy="634.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M69.9688,640.5938 Q69.3906,640.8906 68.75,641.0313 Q68.1094,641.1875 67.4063,641.1875 Q64.9063,641.1875 63.5781,639.5469 Q62.2656,637.8906 62.2656,634.7656 Q62.2656,631.6406 63.5781,629.9844 Q64.9063,628.3281 67.4063,628.3281 Q68.1094,628.3281 68.75,628.4844 Q69.4063,628.6406 69.9688,628.9375 L69.9688,631.6563 Q69.3438,631.0781 68.75,630.8125 Q68.1563,630.5313 67.5313,630.5313 Q66.1875,630.5313 65.5,631.6094 Q64.8125,632.6719 64.8125,634.7656 Q64.8125,636.8594 65.5,637.9375 Q66.1875,639 67.5313,639 Q68.1563,639 68.75,638.7344 Q69.3438,638.4531 69.9688,637.875 L69.9688,640.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="81" y="639.1074">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="650.9531" y2="650.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="53" x2="91" y1="658.9531" y2="658.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="468.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="60.8047" id="C_0001427649116338755656" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="6" y="468.4531"/>
       <ellipse cx="59.75" cy="484.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M62.7188,490.0938 Q62.1406,490.3906 61.5,490.5313 Q60.8594,490.6875 60.1563,490.6875 Q57.6563,490.6875 56.3281,489.0469 Q55.0156,487.3906 55.0156,484.2656 Q55.0156,481.1406 56.3281,479.4844 Q57.6563,477.8281 60.1563,477.8281 Q60.8594,477.8281 61.5,477.9844 Q62.1563,478.1406 62.7188,478.4375 L62.7188,481.1563 Q62.0938,480.5781 61.5,480.3125 Q60.9063,480.0313 60.2813,480.0313 Q58.9375,480.0313 58.25,481.1094 Q57.5625,482.1719 57.5625,484.2656 Q57.5625,486.3594 58.25,487.4375 Q58.9375,488.5 60.2813,488.5 Q60.9063,488.5 61.5,488.2344 Q62.0938,487.9531 62.7188,487.375 L62.7188,490.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="80.25" y="488.6074">BB</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="500.4531" y2="500.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="137" y1="508.4531" y2="508.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" 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="514.4531"/>
       <ellipse cx="17" cy="519.4531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L10" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="26" y="522.6636">b : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="455.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L13" target="_top" title="AKind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L13" xlink:show="new" xlink:title="AKind" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="86.4141" id="C_0001888428536574868284" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="173" y="455.9531"/>
       <ellipse cx="188" cy="471.9531" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.1094,477.9531 L184.3906,477.9531 L184.3906,465.5625 L192.1094,465.5625 L192.1094,467.7188 L186.8438,467.7188 L186.8438,470.3906 L191.6094,470.3906 L191.6094,472.5469 L186.8438,472.5469 L186.8438,475.7969 L192.1094,475.7969 L192.1094,477.9531 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="34" x="202" y="476.1074">AKind</text>
@@ -44,72 +44,72 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="179" y="527.7729">ThreeA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="174" x2="238" y1="534.3672" y2="534.3672"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="48" id="C_0001297439817144700057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="59" y="35.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="48" id="C_0001297439817144700057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="59" y="35.4531"/>
       <ellipse cx="74" cy="51.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M76.9688,57.0938 Q76.3906,57.3906 75.75,57.5313 Q75.1094,57.6875 74.4063,57.6875 Q71.9063,57.6875 70.5781,56.0469 Q69.2656,54.3906 69.2656,51.2656 Q69.2656,48.1406 70.5781,46.4844 Q71.9063,44.8281 74.4063,44.8281 Q75.1094,44.8281 75.75,44.9844 Q76.4063,45.1406 76.9688,45.4375 L76.9688,48.1563 Q76.3438,47.5781 75.75,47.3125 Q75.1563,47.0313 74.5313,47.0313 Q73.1875,47.0313 72.5,48.1094 Q71.8125,49.1719 71.8125,51.2656 Q71.8125,53.3594 72.5,54.4375 Q73.1875,55.5 74.5313,55.5 Q75.1563,55.5 75.75,55.2344 Q76.3438,54.9531 76.9688,54.375 L76.9688,57.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="88" y="55.6074">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="67.4531" y2="67.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="60" x2="98" y1="75.4531" y2="75.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="173.4531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L17" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L17" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="48" id="C_0000577981285610429577" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="63" y="173.4531"/>
       <ellipse cx="78" cy="189.4531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M80.9688,195.0938 Q80.3906,195.3906 79.75,195.5313 Q79.1094,195.6875 78.4063,195.6875 Q75.9063,195.6875 74.5781,194.0469 Q73.2656,192.3906 73.2656,189.2656 Q73.2656,186.1406 74.5781,184.4844 Q75.9063,182.8281 78.4063,182.8281 Q79.1094,182.8281 79.75,182.9844 Q80.4063,183.1406 80.9688,183.4375 L80.9688,186.1563 Q80.3438,185.5781 79.75,185.3125 Q79.1563,185.0313 78.5313,185.0313 Q77.1875,185.0313 76.5,186.1094 Q75.8125,187.1719 75.8125,189.2656 Q75.8125,191.3594 76.5,192.4375 Q77.1875,193.5 78.5313,193.5 Q79.1563,193.5 79.75,193.2344 Q80.3438,192.9531 80.9688,192.375 L80.9688,195.0938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="92" y="193.6074">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="205.4531" y2="205.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="64" x2="110" y1="213.4531" y2="213.4531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="304.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="73.6094" id="C_0001484819281509619918" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="89.5" y="304.9531"/>
       <ellipse cx="123.85" cy="320.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M126.8188,326.5938 Q126.2406,326.8906 125.6,327.0313 Q124.9594,327.1875 124.2563,327.1875 Q121.7563,327.1875 120.4281,325.5469 Q119.1156,323.8906 119.1156,320.7656 Q119.1156,317.6406 120.4281,315.9844 Q121.7563,314.3281 124.2563,314.3281 Q124.9594,314.3281 125.6,314.4844 Q126.2563,314.6406 126.8188,314.9375 L126.8188,317.6563 Q126.1938,317.0781 125.6,316.8125 Q125.0063,316.5313 124.3813,316.5313 Q123.0375,316.5313 122.35,317.6094 Q121.6625,318.6719 121.6625,320.7656 Q121.6625,322.8594 122.35,323.9375 Q123.0375,325 124.3813,325 Q125.0063,325 125.6,324.7344 Q126.1938,324.4531 126.8188,323.875 L126.8188,326.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="142.15" y="325.1074">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="336.9531" y2="336.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="187.5" y1="344.9531" y2="344.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="350.9531"/>
       <ellipse cx="100.5" cy="355.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" target="_top" title="akind" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L21" xlink:show="new" xlink:title="akind" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="109.5" y="359.1636">akind : AKind</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="95.5" y="363.7578"/>
       <ellipse cx="100.5" cy="368.7578" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L20" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="109.5" y="371.9683">bb : BB *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="160" y="166.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="60.8047" id="C_0000999621481464424961" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="160" y="166.9531"/>
       <ellipse cx="197.5" cy="182.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.4688,188.5938 Q199.8906,188.8906 199.25,189.0313 Q198.6094,189.1875 197.9063,189.1875 Q195.4063,189.1875 194.0781,187.5469 Q192.7656,185.8906 192.7656,182.7656 Q192.7656,179.6406 194.0781,177.9844 Q195.4063,176.3281 197.9063,176.3281 Q198.6094,176.3281 199.25,176.4844 Q199.9063,176.6406 200.4688,176.9375 L200.4688,179.6563 Q199.8438,179.0781 199.25,178.8125 Q198.6563,178.5313 198.0313,178.5313 Q196.6875,178.5313 196,179.6094 Q195.3125,180.6719 195.3125,182.7656 Q195.3125,184.8594 196,185.9375 Q196.6875,187 198.0313,187 Q198.6563,187 199.25,186.7344 Q199.8438,186.4531 200.4688,185.875 L200.4688,188.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="216.5" y="187.1074">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="198.9531" y2="198.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="249" y1="206.9531" y2="206.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="166" y="212.9531"/>
       <ellipse cx="171" cy="217.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L25" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="64" x="180" y="221.1636">aaa : AAA *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f739i5uhx1ctd)" height="60.8047" id="C_0001168375787542426694" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="134" y="28.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L28" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L28" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1361qkojdlwn)" height="60.8047" id="C_0001168375787542426694" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="134" y="28.9531"/>
       <ellipse cx="199.75" cy="44.9531" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M202.7188,50.5938 Q202.1406,50.8906 201.5,51.0313 Q200.8594,51.1875 200.1563,51.1875 Q197.6563,51.1875 196.3281,49.5469 Q195.0156,47.8906 195.0156,44.7656 Q195.0156,41.6406 196.3281,39.9844 Q197.6563,38.3281 200.1563,38.3281 Q200.8594,38.3281 201.5,38.4844 Q202.1563,38.6406 202.7188,38.9375 L202.7188,41.6563 Q202.0938,41.0781 201.5,40.8125 Q200.9063,40.5313 200.2813,40.5313 Q198.9375,40.5313 198.25,41.6094 Q197.5625,42.6719 197.5625,44.7656 Q197.5625,46.8594 198.25,47.9375 Q198.9375,49 200.2813,49 Q200.9063,49 201.5,48.7344 Q202.0938,48.4531 202.7188,47.875 L202.7188,50.5938 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="220.25" y="49.1074">RR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="60.9531" y2="60.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="289" y1="68.9531" y2="68.9531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="140" y="74.9531"/>
       <ellipse cx="145" cy="79.9531" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L29" target="_top" title="r" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L29" xlink:show="new" xlink:title="r" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="154" y="83.1636">r : std::shared_ptr&lt;R&gt;</text>
     </a>
     <path d="M72,542.9131 C72,567.8431 72,598.2831 72,618.7731 " fill="none" id="C_0001427649116338755656&lt;-C_0000359183874441719256" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00068_r2_class_mermaid.svg b/docs/test_cases/t00068_r2_class_mermaid.svg
index 9bb3ee6f..152b2363 100644
--- a/docs/test_cases/t00068_r2_class_mermaid.svg
+++ b/docs/test_cases/t00068_r2_class_mermaid.svg
@@ -135,7 +135,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L7">
+        <a transform="translate(82.875, 712.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L7">
           <g title="B" id="classId-C_0000359183874441719256-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -154,7 +154,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L9">
+        <a transform="translate(82.875, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L9">
           <g title="BB" id="classId-C_0001427649116338755656-1" class="node default clickable">
             <rect height="79" width="149.75" y="-39.5" x="-74.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="74.875" x1="-74.875" class="divider"/>
@@ -178,7 +178,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L13">
+        <a transform="translate(268.625, 543.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L13">
           <g title="AKind" id="classId-C_0001888428536574868284-2" class="node default clickable">
             <rect height="145" width="121.75" y="-72.5" x="-60.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -212,7 +212,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L15">
+        <a transform="translate(99.11328125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L15">
           <g title="A" id="classId-C_0001297439817144700057-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -231,7 +231,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L17">
+        <a transform="translate(99.11328125, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L17">
           <g title="AA" id="classId-C_0000577981285610429577-4" class="node default clickable">
             <rect height="57" width="38.109375" y="-28.5" x="-19.0546875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -250,7 +250,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L19">
+        <a transform="translate(175.75, 352.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L19">
           <g title="AAA" id="classId-C_0001484819281509619918-5" class="node default clickable">
             <rect height="101" width="117.75" y="-50.5" x="-58.875" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="58.875" x1="-58.875" class="divider"/>
@@ -279,7 +279,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L24">
+        <a transform="translate(252.38671875, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L24">
           <g title="R" id="classId-C_0000999621481464424961-6" class="node default clickable">
             <rect height="79" width="95.796875" y="-39.5" x="-47.8984375" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="47.8984375" x1="-47.8984375" class="divider"/>
@@ -303,7 +303,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00068/t00068.cc#L28">
+        <a transform="translate(252.38671875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00068/t00068.cc#L28">
           <g title="RR" id="classId-C_0001168375787542426694-7" class="node default clickable">
             <rect height="79" width="179.984375" y="-39.5" x="-89.9921875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="89.9921875" x1="-89.9921875" class="divider"/>
diff --git a/docs/test_cases/t00069.md b/docs/test_cases/t00069.md
index e544d504..a68a1adf 100644
--- a/docs/test_cases/t00069.md
+++ b/docs/test_cases/t00069.md
@@ -126,6 +126,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "generator",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -153,10 +154,12 @@ private:
             "line": 11,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "~generator",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -179,6 +182,7 @@ private:
             "line": 16,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -238,6 +242,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "get_return_object",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -260,10 +265,12 @@ private:
             "line": 22,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "generator<T>"
         },
         {
           "access": "public",
+          "display_name": "initial_suspend",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -286,10 +293,12 @@ private:
             "line": 26,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "std::suspend_always"
         },
         {
           "access": "public",
+          "display_name": "final_suspend",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -312,10 +321,12 @@ private:
             "line": 28,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "std::suspend_always"
         },
         {
           "access": "public",
+          "display_name": "unhandled_exception",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -338,10 +349,12 @@ private:
             "line": 30,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "return_void",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -364,10 +377,12 @@ private:
             "line": 39,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "yield_value<std::convertible_to From>",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -389,6 +404,14 @@ private:
               "type": "From &&"
             }
           ],
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "template_type",
+              "name": "From",
+              "template_parameters": []
+            }
+          ],
           "type": "std::suspend_always"
         }
       ],
@@ -458,6 +481,7 @@ private:
       "methods": [
         {
           "access": "public",
+          "display_name": "iota",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -480,10 +504,12 @@ private:
             "line": 50,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "clanguml::t00069::generator<unsigned long>"
         },
         {
           "access": "public",
+          "display_name": "seed",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -506,6 +532,7 @@ private:
             "line": 52,
             "translation_unit": "t00069.cc"
           },
+          "template_parameters": [],
           "type": "clanguml::t00069::generator<unsigned long>"
         }
       ],
diff --git a/docs/test_cases/t00069_class.svg b/docs/test_cases/t00069_class.svg
index c65f3232..cccbeff7 100644
--- a/docs/test_cases/t00069_class.svg
+++ b/docs/test_cases/t00069_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="474px" preserveAspectRatio="none" style="width:760px;height:474px;" version="1.1" viewBox="0 0 760 474" width="760px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1o1ijpkmus6dn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1gs4am3w8ivgh" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o1ijpkmus6dn)" height="99.2188" id="C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="319" y="364"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gs4am3w8ivgh)" height="99.2188" id="C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="319" y="364"/>
       <ellipse cx="379.75" cy="380" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M382.7188,385.6406 Q382.1406,385.9375 381.5,386.0781 Q380.8594,386.2344 380.1563,386.2344 Q377.6563,386.2344 376.3281,384.5938 Q375.0156,382.9375 375.0156,379.8125 Q375.0156,376.6875 376.3281,375.0313 Q377.6563,373.375 380.1563,373.375 Q380.8594,373.375 381.5,373.5313 Q382.1563,373.6875 382.7188,373.9844 L382.7188,376.7031 Q382.0938,376.125 381.5,375.8594 Q380.9063,375.5781 380.2813,375.5781 Q378.9375,375.5781 378.25,376.6563 Q377.5625,377.7188 377.5625,379.8125 Q377.5625,381.9063 378.25,382.9844 Q378.9375,384.0469 380.2813,384.0469 Q380.9063,384.0469 381.5,383.7813 Q382.0938,383.5 382.7188,382.9219 L382.7188,385.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="400.25" y="384.1543">generator</text>
@@ -18,96 +18,96 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="518" y="373.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="320" x2="522" y1="396" y2="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="402"/>
       <ellipse cx="330" cy="407" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L11" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L11" xlink:show="new" xlink:title="generator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="178" x="339" y="410.2104">generator(handle_type h) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="414.8047"/>
       <ellipse cx="330" cy="419.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L16" target="_top" title="~generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L16" xlink:show="new" xlink:title="~generator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="339" y="423.0151">~generator() : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="320" x2="522" y1="429.6094" y2="429.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="435.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="327" y="437.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L45" target="_top" title="full_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L45" xlink:show="new" xlink:title="full_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="339" y="443.8198">full_ : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="325" y="448.4141"/>
       <ellipse cx="330" cy="453.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L42" target="_top" title="h_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L42" xlink:show="new" xlink:title="h_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="339" y="456.6245">h_ : handle_type</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L18" target="_top" title="generator##promise_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L18" xlink:show="new" xlink:title="generator##promise_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o1ijpkmus6dn)" height="150.4375" id="C_0000721812727497968117" style="stroke: #A80036; stroke-width: 1.5;" width="468" x="6" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L18" target="_top" title="generator##promise_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L18" xlink:show="new" xlink:title="generator##promise_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gs4am3w8ivgh)" height="150.4375" id="C_0000721812727497968117" style="stroke: #A80036; stroke-width: 1.5;" width="468" x="6" y="154"/>
       <ellipse cx="158.75" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M161.7188,175.6406 Q161.1406,175.9375 160.5,176.0781 Q159.8594,176.2344 159.1563,176.2344 Q156.6563,176.2344 155.3281,174.5938 Q154.0156,172.9375 154.0156,169.8125 Q154.0156,166.6875 155.3281,165.0313 Q156.6563,163.375 159.1563,163.375 Q159.8594,163.375 160.5,163.5313 Q161.1563,163.6875 161.7188,163.9844 L161.7188,166.7031 Q161.0938,166.125 160.5,165.8594 Q159.9063,165.5781 159.2813,165.5781 Q157.9375,165.5781 157.25,166.6563 Q156.5625,167.7188 156.5625,169.8125 Q156.5625,171.9063 157.25,172.9844 Q157.9375,174.0469 159.2813,174.0469 Q159.9063,174.0469 160.5,173.7813 Q161.0938,173.5 161.7188,172.9219 L161.7188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="154" x="179.25" y="174.1543">generator::promise_type</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="473" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="192"/>
       <ellipse cx="17" cy="197" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L28" target="_top" title="final_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L28" xlink:show="new" xlink:title="final_suspend" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="274" x="26" y="200.2104">final_suspend() noexcept : std::suspend_always</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="204.8047"/>
       <ellipse cx="17" cy="209.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L22" target="_top" title="get_return_object" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L22" xlink:show="new" xlink:title="get_return_object" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="200" x="26" y="213.0151">get_return_object() : generator&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="217.6094"/>
       <ellipse cx="17" cy="222.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L26" target="_top" title="initial_suspend" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L26" xlink:show="new" xlink:title="initial_suspend" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="225" x="26" y="225.8198">initial_suspend() : std::suspend_always</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="230.4141"/>
       <ellipse cx="17" cy="235.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L39" target="_top" title="return_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L39" xlink:show="new" xlink:title="return_void" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="26" y="238.6245">return_void() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="243.2188"/>
       <ellipse cx="17" cy="248.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L30" target="_top" title="unhandled_exception" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L30" xlink:show="new" xlink:title="unhandled_exception" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="26" y="251.4292">unhandled_exception() : void</text>
     </a>
     <ellipse cx="17" cy="261.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="442" x="26" y="264.2339">yield_value&lt;std::convertible_to From&gt;(From &amp;&amp; from) : std::suspend_always</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="473" y1="270.8281" y2="270.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="276.8281"/>
       <ellipse cx="17" cy="281.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L20" target="_top" title="exception_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L20" xlink:show="new" xlink:title="exception_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="174" x="26" y="285.0386">exception_ : std::exception_ptr</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L19" 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="289.6328"/>
       <ellipse cx="17" cy="294.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L19" target="_top" title="value_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L19" xlink:show="new" xlink:title="value_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="297.8433">value_ : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o1ijpkmus6dn)" height="48" id="C_0001604358347140526608" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="509.5" y="205"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L7" target="_top" title="generator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L7" xlink:show="new" xlink:title="generator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gs4am3w8ivgh)" height="48" id="C_0001604358347140526608" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="509.5" y="205"/>
       <ellipse cx="524.5" cy="221" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.4688,226.6406 Q526.8906,226.9375 526.25,227.0781 Q525.6094,227.2344 524.9063,227.2344 Q522.4063,227.2344 521.0781,225.5938 Q519.7656,223.9375 519.7656,220.8125 Q519.7656,217.6875 521.0781,216.0313 Q522.4063,214.375 524.9063,214.375 Q525.6094,214.375 526.25,214.5313 Q526.9063,214.6875 527.4688,214.9844 L527.4688,217.7031 Q526.8438,217.125 526.25,216.8594 Q525.6563,216.5781 525.0313,216.5781 Q523.6875,216.5781 523,217.6563 Q522.3125,218.7188 522.3125,220.8125 Q522.3125,222.9063 523,223.9844 Q523.6875,225.0469 525.0313,225.0469 Q525.6563,225.0469 526.25,224.7813 Q526.8438,224.5 527.4688,223.9219 L527.4688,226.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="538.5" y="225.1543">generator</text>
@@ -116,33 +116,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="695.5" y1="237" y2="237"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="510.5" x2="695.5" y1="245" y2="245"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L48" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L48" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o1ijpkmus6dn)" height="86.4141" id="C_0002160142503252767290" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="456.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L48" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L48" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gs4am3w8ivgh)" height="86.4141" id="C_0002160142503252767290" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="456.5" y="8"/>
       <ellipse cx="594.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.7188,29.6406 Q597.1406,29.9375 596.5,30.0781 Q595.8594,30.2344 595.1563,30.2344 Q592.6563,30.2344 591.3281,28.5938 Q590.0156,26.9375 590.0156,23.8125 Q590.0156,20.6875 591.3281,19.0313 Q592.6563,17.375 595.1563,17.375 Q595.8594,17.375 596.5,17.5313 Q597.1563,17.6875 597.7188,17.9844 L597.7188,20.7031 Q597.0938,20.125 596.5,19.8594 Q595.9063,19.5781 595.2813,19.5781 Q593.9375,19.5781 593.25,20.6563 Q592.5625,21.7188 592.5625,23.8125 Q592.5625,25.9063 593.25,26.9844 Q593.9375,28.0469 595.2813,28.0469 Q595.9063,28.0469 596.5,27.7813 Q597.0938,27.5 597.7188,26.9219 L597.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="615.25" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="457.5" x2="748.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="46"/>
       <ellipse cx="467.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L50" target="_top" title="iota" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L50" xlink:show="new" xlink:title="iota" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="260" x="476.5" y="54.2104">iota() [coroutine] : generator&lt;unsigned long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="58.8047"/>
       <ellipse cx="467.5" cy="63.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L52" target="_top" title="seed" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L52" xlink:show="new" xlink:title="seed" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="267" x="476.5" y="67.0151">seed() [coroutine] : generator&lt;unsigned long&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="457.5" x2="748.5" y1="73.6094" y2="73.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="462.5" y="79.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="464.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L59" target="_top" title="counter_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L59" xlink:show="new" xlink:title="counter_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="141" x="476.5" y="87.8198">counter_ : unsigned long</text>
     </a>
     <path d="M313.62,304.23 C329.69,320.43 346.49,337.37 361.9,352.91 " fill="none" id="C_0000721812727497968117-&gt;C_0002142496233889685657" style="stroke: #A80036; stroke-width: 1.0;"/>
diff --git a/docs/test_cases/t00069_class_mermaid.svg b/docs/test_cases/t00069_class_mermaid.svg
index 58ff002e..c0f5772b 100644
--- a/docs/test_cases/t00069_class_mermaid.svg
+++ b/docs/test_cases/t00069_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(196.2421875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L7">
+        <a transform="translate(196.2421875, 360.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L7">
           <g title="generator" id="classId-C_0002142496233889685657-0" class="node default clickable">
             <rect height="145" width="246.71875" y="-72.5" x="-123.359375" class="outer title-state"/>
             <line y2="-42.5" y1="-42.5" x2="123.359375" x1="-123.359375" class="divider"/>
@@ -129,7 +129,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(196.2421875, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L18">
+        <a transform="translate(196.2421875, 599.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L18">
           <g title="generator##promise_type" id="classId-C_0000721812727497968117-1" class="node default clickable">
             <rect height="233" width="376.484375" y="-116.5" x="-188.2421875" class="outer title-state"/>
             <line y2="-86.5" y1="-86.5" x2="188.2421875" x1="-188.2421875" class="divider"/>
@@ -188,7 +188,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(196.2421875, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L7">
+        <a transform="translate(196.2421875, 209.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L7">
           <g title="generator" id="classId-C_0001604358347140526608-2" class="node default clickable">
             <rect height="57" width="216.8125" y="-28.5" x="-108.40625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="108.40625" x1="-108.40625" class="divider"/>
@@ -207,7 +207,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(196.2421875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00069/t00069.cc#L48">
+        <a transform="translate(196.2421875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00069/t00069.cc#L48">
           <g title="A" id="classId-C_0002160142503252767290-3" class="node default clickable">
             <rect height="123" width="349.015625" y="-61.5" x="-174.5078125" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="174.5078125" x1="-174.5078125" class="divider"/>
diff --git a/docs/test_cases/t00070.md b/docs/test_cases/t00070.md
index 047fa287..ffc7cc62 100644
--- a/docs/test_cases/t00070.md
+++ b/docs/test_cases/t00070.md
@@ -211,6 +211,7 @@ class BBBB { };
       "methods": [
         {
           "access": "private",
+          "display_name": "get",
           "is_const": false,
           "is_consteval": false,
           "is_constexpr": false,
@@ -233,6 +234,7 @@ class BBBB { };
             "line": 7,
             "translation_unit": "t00070.cc"
           },
+          "template_parameters": [],
           "type": "int"
         }
       ],
diff --git a/docs/test_cases/t00070_class.svg b/docs/test_cases/t00070_class.svg
index 2cec7afa..4768b86b 100644
--- a/docs/test_cases/t00070_class.svg
+++ b/docs/test_cases/t00070_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="213px" preserveAspectRatio="none" style="width:186px;height:213px;" version="1.1" viewBox="0 0 186 213" width="186px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fl9ftw2i4i2cl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4r7ogf42d82p" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9ftw2i4i2cl)" height="48" id="C_0001364261599035905834" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="14" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4r7ogf42d82p)" height="48" id="C_0001364261599035905834" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="14" y="14.5"/>
       <ellipse cx="29" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M31.9688,36.1406 Q31.3906,36.4375 30.75,36.5781 Q30.1094,36.7344 29.4063,36.7344 Q26.9063,36.7344 25.5781,35.0938 Q24.2656,33.4375 24.2656,30.3125 Q24.2656,27.1875 25.5781,25.5313 Q26.9063,23.875 29.4063,23.875 Q30.1094,23.875 30.75,24.0313 Q31.4063,24.1875 31.9688,24.4844 L31.9688,27.2031 Q31.3438,26.625 30.75,26.3594 Q30.1563,26.0781 29.5313,26.0781 Q28.1875,26.0781 27.5,27.1563 Q26.8125,28.2188 26.8125,30.3125 Q26.8125,32.4063 27.5,33.4844 Q28.1875,34.5469 29.5313,34.5469 Q30.1563,34.5469 30.75,34.2813 Q31.3438,34 31.9688,33.4219 L31.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="43" y="34.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="53" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="15" x2="53" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9ftw2i4i2cl)" height="60.8047" id="C_0001485755083045282660" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="89.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4r7ogf42d82p)" height="60.8047" id="C_0001485755083045282660" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="89.5" y="8"/>
       <ellipse cx="104.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.4688,29.6406 Q106.8906,29.9375 106.25,30.0781 Q105.6094,30.2344 104.9063,30.2344 Q102.4063,30.2344 101.0781,28.5938 Q99.7656,26.9375 99.7656,23.8125 Q99.7656,20.6875 101.0781,19.0313 Q102.4063,17.375 104.9063,17.375 Q105.6094,17.375 106.25,17.5313 Q106.9063,17.6875 107.4688,17.9844 L107.4688,20.7031 Q106.8438,20.125 106.25,19.8594 Q105.6563,19.5781 105.0313,19.5781 Q103.6875,19.5781 103,20.6563 Q102.3125,21.7188 102.3125,23.8125 Q102.3125,25.9063 103,26.9844 Q103.6875,28.0469 105.0313,28.0469 Q105.6563,28.0469 106.25,27.7813 Q106.8438,27.5 107.4688,26.9219 L107.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="118.5" y="28.1543">BB</text>
@@ -27,15 +27,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="147.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="90.5" x2="147.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#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="95.5" y="54"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="97.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="109.5" y="62.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L10" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L10" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9ftw2i4i2cl)" height="73.6094" id="C_0001734694076622541097" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="6" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L10" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L10" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4r7ogf42d82p)" height="73.6094" id="C_0001734694076622541097" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="6" y="129"/>
       <ellipse cx="21" cy="145" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M25.1094,151 L17.3906,151 L17.3906,138.6094 L25.1094,138.6094 L25.1094,140.7656 L19.8438,140.7656 L19.8438,143.4375 L24.6094,143.4375 L24.6094,145.5938 L19.8438,145.5938 L19.8438,148.8438 L25.1094,148.8438 L25.1094,151 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="35" y="149.1543">BBB</text>
@@ -44,26 +44,26 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="12" y="188.0151">bbb2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="61" y1="194.6094" y2="194.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fl9ftw2i4i2cl)" height="73.6094" id="C_0000668221430913861424" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="97" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4r7ogf42d82p)" height="73.6094" id="C_0000668221430913861424" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="97" y="129"/>
       <ellipse cx="129.1" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M132.0688,150.6406 Q131.4906,150.9375 130.85,151.0781 Q130.2094,151.2344 129.5063,151.2344 Q127.0063,151.2344 125.6781,149.5938 Q124.3656,147.9375 124.3656,144.8125 Q124.3656,141.6875 125.6781,140.0313 Q127.0063,138.375 129.5063,138.375 Q130.2094,138.375 130.85,138.5313 Q131.5063,138.6875 132.0688,138.9844 L132.0688,141.7031 Q131.4438,141.125 130.85,140.8594 Q130.2563,140.5781 129.6313,140.5781 Q128.2875,140.5781 127.6,141.6563 Q126.9125,142.7188 126.9125,144.8125 Q126.9125,146.9063 127.6,147.9844 Q128.2875,149.0469 129.6313,149.0469 Q130.2563,149.0469 130.85,148.7813 Q131.4438,148.5 132.0688,147.9219 L132.0688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="146.9" y="149.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="174" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="103" y="167"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="169"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="117" y="175.2104">get() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="98" x2="174" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#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="103" y="187.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="105" y="189.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#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="117" y="196.0151">a : int</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00070_class_mermaid.svg b/docs/test_cases/t00070_class_mermaid.svg
index 84d9c98a..d57069ac 100644
--- a/docs/test_cases/t00070_class_mermaid.svg
+++ b/docs/test_cases/t00070_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L4">
+        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001364261599035905834-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L6">
+        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0001485755083045282660-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -95,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/lib1.cppm#L10">
+        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/lib1.cppm#L10">
           <g title="BBB" id="classId-C_0001734694076622541097-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -124,7 +124,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(414.625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00070/src/common.cppm#L6">
+        <a transform="translate(414.625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00070/src/common.cppm#L6">
           <g title="A" id="classId-C_0000668221430913861424-3" class="node default clickable">
             <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
diff --git a/docs/test_cases/t00071.md b/docs/test_cases/t00071.md
index abf6dfcd..e7cedd2a 100644
--- a/docs/test_cases/t00071.md
+++ b/docs/test_cases/t00071.md
@@ -187,7 +187,7 @@ class D { };
                 "bbb1",
                 "bbb2"
               ],
-              "display_name": "detail::BBB",
+              "display_name": "BBB",
               "id": "1625078061541942293",
               "is_nested": false,
               "module": {
@@ -354,7 +354,7 @@ class D { };
                 "ccc1",
                 "ccc2"
               ],
-              "display_name": "detail::CCC",
+              "display_name": "CCC",
               "id": "931278702894205804",
               "is_nested": false,
               "module": {
@@ -401,6 +401,7 @@ class D { };
           "methods": [
             {
               "access": "private",
+              "display_name": "get",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -423,6 +424,7 @@ class D { };
                 "line": 7,
                 "translation_unit": "t00071.cc"
               },
+              "template_parameters": [],
               "type": "int"
             }
           ],
diff --git a/docs/test_cases/t00071_class.svg b/docs/test_cases/t00071_class.svg
index 07e03127..24945452 100644
--- a/docs/test_cases/t00071_class.svg
+++ b/docs/test_cases/t00071_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="402px" preserveAspectRatio="none" style="width:1004px;height:402px;" version="1.1" viewBox="0 0 1004 402" width="1004px" zoomAndPan="magnify">
+<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:918px;height:402px;" version="1.1" viewBox="0 0 918 402" width="918px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxemavvb3sdrp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1artwwnois4v7" 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,166 +9,166 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fxemavvb3sdrp)" points="22,157,57,157,64,179.2969,982,179.2969,982,390,22,390,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1artwwnois4v7)" points="22,157,57,157,64,179.2969,896,179.2969,896,390,22,390,22,157" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="179.2969" y2="179.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="171.9951">app</text>
-    <polygon fill="#FFFFFF" filter="url(#fxemavvb3sdrp)" points="135,200,169,200,176,222.2969,633,222.2969,633,366,135,366,135,200" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1artwwnois4v7)" points="135,200,169,200,176,222.2969,590,222.2969,590,366,135,366,135,200" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="135" x2="176" y1="222.2969" y2="222.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="139" y="214.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#fxemavvb3sdrp)" points="535,243,585,243,592,265.2969,609,265.2969,609,342,535,342,535,243" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="535" x2="592" y1="265.2969" y2="265.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="539" y="257.9951">mod1</text>
-    <polygon fill="#FFFFFF" filter="url(#fxemavvb3sdrp)" points="439,243,489,243,496,265.2969,511,265.2969,511,342,439,342,439,243" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="439" x2="496" y1="265.2969" y2="265.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="443" y="257.9951">mod2</text>
-    <polygon fill="#FFFFFF" filter="url(#fxemavvb3sdrp)" points="657,230,691,230,698,252.2969,958,252.2969,958,355,657,355,657,230" style="stroke: #000000; stroke-width: 1.5;"/>
-    <line style="stroke: #000000; stroke-width: 1.5;" x1="657" x2="698" y1="252.2969" y2="252.2969"/>
-    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="661" y="244.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="73.6094" id="C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="265"/>
+    <polygon fill="#FFFFFF" filter="url(#f1artwwnois4v7)" points="492,243,542,243,549,265.2969,566,265.2969,566,342,492,342,492,243" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="492" x2="549" y1="265.2969" y2="265.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="496" y="257.9951">mod1</text>
+    <polygon fill="#FFFFFF" filter="url(#f1artwwnois4v7)" points="396,243,446,243,453,265.2969,468,265.2969,468,342,396,342,396,243" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="396" x2="453" y1="265.2969" y2="265.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="400" y="257.9951">mod2</text>
+    <polygon fill="#FFFFFF" filter="url(#f1artwwnois4v7)" points="614,230,648,230,655,252.2969,872,252.2969,872,355,614,355,614,230" style="stroke: #000000; stroke-width: 1.5;"/>
+    <line style="stroke: #000000; stroke-width: 1.5;" x1="614" x2="655" y1="252.2969" y2="252.2969"/>
+    <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="618" y="244.9951">lib2</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="73.6094" id="C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="265"/>
       <ellipse cx="70.1" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M73.0688,286.6406 Q72.4906,286.9375 71.85,287.0781 Q71.2094,287.2344 70.5063,287.2344 Q68.0063,287.2344 66.6781,285.5938 Q65.3656,283.9375 65.3656,280.8125 Q65.3656,277.6875 66.6781,276.0313 Q68.0063,274.375 70.5063,274.375 Q71.2094,274.375 71.85,274.5313 Q72.5063,274.6875 73.0688,274.9844 L73.0688,277.7031 Q72.4438,277.125 71.85,276.8594 Q71.2563,276.5781 70.6313,276.5781 Q69.2875,276.5781 68.6,277.6563 Q67.9125,278.7188 67.9125,280.8125 Q67.9125,282.9063 68.6,283.9844 Q69.2875,285.0469 70.6313,285.0469 Q71.2563,285.0469 71.85,284.7813 Q72.4438,284.5 73.0688,283.9219 L73.0688,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="87.9" y="285.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="303"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L7" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L7" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="58" y="311.2104">get() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="317.8047" y2="317.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#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="44" y="323.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="325.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#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="58" y="332.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="48" id="C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="380" y="278"/>
-      <ellipse cx="395" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M397.9688,299.6406 Q397.3906,299.9375 396.75,300.0781 Q396.1094,300.2344 395.4063,300.2344 Q392.9063,300.2344 391.5781,298.5938 Q390.2656,296.9375 390.2656,293.8125 Q390.2656,290.6875 391.5781,289.0313 Q392.9063,287.375 395.4063,287.375 Q396.1094,287.375 396.75,287.5313 Q397.4063,287.6875 397.9688,287.9844 L397.9688,290.7031 Q397.3438,290.125 396.75,289.8594 Q396.1563,289.5781 395.5313,289.5781 Q394.1875,289.5781 393.5,290.6563 Q392.8125,291.7188 392.8125,293.8125 Q392.8125,295.9063 393.5,296.9844 Q394.1875,298.0469 395.5313,298.0469 Q396.1563,298.0469 396.75,297.7813 Q397.3438,297.5 397.9688,296.9219 L397.9688,299.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="409" y="298.1543">B</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381" x2="419" y1="310" y2="310"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="381" x2="419" y1="318" y2="318"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="48" id="C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="337" y="278"/>
+      <ellipse cx="352" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M354.9688,299.6406 Q354.3906,299.9375 353.75,300.0781 Q353.1094,300.2344 352.4063,300.2344 Q349.9063,300.2344 348.5781,298.5938 Q347.2656,296.9375 347.2656,293.8125 Q347.2656,290.6875 348.5781,289.0313 Q349.9063,287.375 352.4063,287.375 Q353.1094,287.375 353.75,287.5313 Q354.4063,287.6875 354.9688,287.9844 L354.9688,290.7031 Q354.3438,290.125 353.75,289.8594 Q353.1563,289.5781 352.5313,289.5781 Q351.1875,289.5781 350.5,290.6563 Q349.8125,291.7188 349.8125,293.8125 Q349.8125,295.9063 350.5,296.9844 Q351.1875,298.0469 352.5313,298.0469 Q353.1563,298.0469 353.75,297.7813 Q354.3438,297.5 354.9688,296.9219 L354.9688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="366" y="298.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="338" x2="376" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="338" x2="376" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="60.8047" id="C_0000569632796637866961" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="285.5" y="271.5"/>
-      <ellipse cx="300.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M303.4688,293.1406 Q302.8906,293.4375 302.25,293.5781 Q301.6094,293.7344 300.9063,293.7344 Q298.4063,293.7344 297.0781,292.0938 Q295.7656,290.4375 295.7656,287.3125 Q295.7656,284.1875 297.0781,282.5313 Q298.4063,280.875 300.9063,280.875 Q301.6094,280.875 302.25,281.0313 Q302.9063,281.1875 303.4688,281.4844 L303.4688,284.2031 Q302.8438,283.625 302.25,283.3594 Q301.6563,283.0781 301.0313,283.0781 Q299.6875,283.0781 299,284.1563 Q298.3125,285.2188 298.3125,287.3125 Q298.3125,289.4063 299,290.4844 Q299.6875,291.5469 301.0313,291.5469 Q301.6563,291.5469 302.25,291.2813 Q302.8438,291 303.4688,290.4219 L303.4688,293.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="314.5" y="291.6543">BB</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="338.5" y="268.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="339.5" y="280.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="286.5" x2="343.5" y1="303.5" y2="303.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="286.5" x2="343.5" y1="311.5" y2="311.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="60.8047" id="C_0000569632796637866961" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="242.5" y="271.5"/>
+      <ellipse cx="257.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M260.4688,293.1406 Q259.8906,293.4375 259.25,293.5781 Q258.6094,293.7344 257.9063,293.7344 Q255.4063,293.7344 254.0781,292.0938 Q252.7656,290.4375 252.7656,287.3125 Q252.7656,284.1875 254.0781,282.5313 Q255.4063,280.875 257.9063,280.875 Q258.6094,280.875 259.25,281.0313 Q259.9063,281.1875 260.4688,281.4844 L260.4688,284.2031 Q259.8438,283.625 259.25,283.3594 Q258.6563,283.0781 258.0313,283.0781 Q256.6875,283.0781 256,284.1563 Q255.3125,285.2188 255.3125,287.3125 Q255.3125,289.4063 256,290.4844 Q256.6875,291.5469 258.0313,291.5469 Q258.6563,291.5469 259.25,291.2813 Q259.8438,291 260.4688,290.4219 L260.4688,293.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="271.5" y="291.6543">BB</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="295.5" y="268.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="296.5" y="280.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="243.5" x2="300.5" y1="303.5" y2="303.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="243.5" x2="300.5" y1="311.5" y2="311.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#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="291.5" y="317.5"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="293.5" y="319.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#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="248.5" y="317.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="250.5" y="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="305.5" y="325.7104">t : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="262.5" y="325.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="73.6094" id="C_0001625078061541942293" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="265"/>
-      <ellipse cx="166.5" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M170.6094,287 L162.8906,287 L162.8906,274.6094 L170.6094,274.6094 L170.6094,276.7656 L165.3438,276.7656 L165.3438,279.4375 L170.1094,279.4375 L170.1094,281.5938 L165.3438,281.5938 L165.3438,284.8438 L170.6094,284.8438 L170.6094,287 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="180.5" y="285.1543">detail::BBB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="297" y2="297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="157.5" y="311.2104">bbb1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="157.5" y="324.0151">bbb2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="330.6094" y2="330.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="73.6094" id="C_0001625078061541942293" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="151" y="265"/>
+      <ellipse cx="166" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M170.1094,287 L162.3906,287 L162.3906,274.6094 L170.1094,274.6094 L170.1094,276.7656 L164.8438,276.7656 L164.8438,279.4375 L169.6094,279.4375 L169.6094,281.5938 L164.8438,281.5938 L164.8438,284.8438 L170.1094,284.8438 L170.1094,287 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="180" y="285.1543">BBB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="206" y1="297" y2="297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="157" y="311.2104">bbb1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="157" y="324.0151">bbb2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="206" y1="330.6094" y2="330.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="48" id="C_0001168777064323042894" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="551.5" y="278"/>
-      <ellipse cx="566.5" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M569.4688,299.6406 Q568.8906,299.9375 568.25,300.0781 Q567.6094,300.2344 566.9063,300.2344 Q564.4063,300.2344 563.0781,298.5938 Q561.7656,296.9375 561.7656,293.8125 Q561.7656,290.6875 563.0781,289.0313 Q564.4063,287.375 566.9063,287.375 Q567.6094,287.375 568.25,287.5313 Q568.9063,287.6875 569.4688,287.9844 L569.4688,290.7031 Q568.8438,290.125 568.25,289.8594 Q567.6563,289.5781 567.0313,289.5781 Q565.6875,289.5781 565,290.6563 Q564.3125,291.7188 564.3125,293.8125 Q564.3125,295.9063 565,296.9844 Q565.6875,298.0469 567.0313,298.0469 Q567.6563,298.0469 568.25,297.7813 Q568.8438,297.5 569.4688,296.9219 L569.4688,299.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="580.5" y="298.1543">D</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="591.5" y1="310" y2="310"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="552.5" x2="591.5" y1="318" y2="318"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="48" id="C_0001168777064323042894" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="508.5" y="278"/>
+      <ellipse cx="523.5" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M526.4688,299.6406 Q525.8906,299.9375 525.25,300.0781 Q524.6094,300.2344 523.9063,300.2344 Q521.4063,300.2344 520.0781,298.5938 Q518.7656,296.9375 518.7656,293.8125 Q518.7656,290.6875 520.0781,289.0313 Q521.4063,287.375 523.9063,287.375 Q524.6094,287.375 525.25,287.5313 Q525.9063,287.6875 526.4688,287.9844 L526.4688,290.7031 Q525.8438,290.125 525.25,289.8594 Q524.6563,289.5781 524.0313,289.5781 Q522.6875,289.5781 522,290.6563 Q521.3125,291.7188 521.3125,293.8125 Q521.3125,295.9063 522,296.9844 Q522.6875,298.0469 524.0313,298.0469 Q524.6563,298.0469 525.25,297.7813 Q525.8438,297.5 526.4688,296.9219 L526.4688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="537.5" y="298.1543">D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="509.5" x2="548.5" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="509.5" x2="548.5" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="48" id="C_0001302694761523535504" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="455" y="278"/>
-      <ellipse cx="470" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M472.9688,299.6406 Q472.3906,299.9375 471.75,300.0781 Q471.1094,300.2344 470.4063,300.2344 Q467.9063,300.2344 466.5781,298.5938 Q465.2656,296.9375 465.2656,293.8125 Q465.2656,290.6875 466.5781,289.0313 Q467.9063,287.375 470.4063,287.375 Q471.1094,287.375 471.75,287.5313 Q472.4063,287.6875 472.9688,287.9844 L472.9688,290.7031 Q472.3438,290.125 471.75,289.8594 Q471.1563,289.5781 470.5313,289.5781 Q469.1875,289.5781 468.5,290.6563 Q467.8125,291.7188 467.8125,293.8125 Q467.8125,295.9063 468.5,296.9844 Q469.1875,298.0469 470.5313,298.0469 Q471.1563,298.0469 471.75,297.7813 Q472.3438,297.5 472.9688,296.9219 L472.9688,299.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="484" y="298.1543">E</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="456" x2="494" y1="310" y2="310"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="456" x2="494" y1="318" y2="318"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="48" id="C_0001302694761523535504" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="412" y="278"/>
+      <ellipse cx="427" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M429.9688,299.6406 Q429.3906,299.9375 428.75,300.0781 Q428.1094,300.2344 427.4063,300.2344 Q424.9063,300.2344 423.5781,298.5938 Q422.2656,296.9375 422.2656,293.8125 Q422.2656,290.6875 423.5781,289.0313 Q424.9063,287.375 427.4063,287.375 Q428.1094,287.375 428.75,287.5313 Q429.4063,287.6875 429.9688,287.9844 L429.9688,290.7031 Q429.3438,290.125 428.75,289.8594 Q428.1563,289.5781 427.5313,289.5781 Q426.1875,289.5781 425.5,290.6563 Q424.8125,291.7188 424.8125,293.8125 Q424.8125,295.9063 425.5,296.9844 Q426.1875,298.0469 427.5313,298.0469 Q428.1563,298.0469 428.75,297.7813 Q429.3438,297.5 429.9688,296.9219 L429.9688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="441" y="298.1543">E</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="413" x2="451" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="413" x2="451" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="48" id="C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="902" y="278"/>
-      <ellipse cx="917" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M919.9688,299.6406 Q919.3906,299.9375 918.75,300.0781 Q918.1094,300.2344 917.4063,300.2344 Q914.9063,300.2344 913.5781,298.5938 Q912.2656,296.9375 912.2656,293.8125 Q912.2656,290.6875 913.5781,289.0313 Q914.9063,287.375 917.4063,287.375 Q918.1094,287.375 918.75,287.5313 Q919.4063,287.6875 919.9688,287.9844 L919.9688,290.7031 Q919.3438,290.125 918.75,289.8594 Q918.1563,289.5781 917.5313,289.5781 Q916.1875,289.5781 915.5,290.6563 Q914.8125,291.7188 914.8125,293.8125 Q914.8125,295.9063 915.5,296.9844 Q916.1875,298.0469 917.5313,298.0469 Q918.1563,298.0469 918.75,297.7813 Q919.3438,297.5 919.9688,296.9219 L919.9688,299.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="931" y="298.1543">C</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="903" x2="941" y1="310" y2="310"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="903" x2="941" y1="318" y2="318"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="48" id="C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="816" y="278"/>
+      <ellipse cx="831" cy="294" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M833.9688,299.6406 Q833.3906,299.9375 832.75,300.0781 Q832.1094,300.2344 831.4063,300.2344 Q828.9063,300.2344 827.5781,298.5938 Q826.2656,296.9375 826.2656,293.8125 Q826.2656,290.6875 827.5781,289.0313 Q828.9063,287.375 831.4063,287.375 Q832.1094,287.375 832.75,287.5313 Q833.4063,287.6875 833.9688,287.9844 L833.9688,290.7031 Q833.3438,290.125 832.75,289.8594 Q832.1563,289.5781 831.5313,289.5781 Q830.1875,289.5781 829.5,290.6563 Q828.8125,291.7188 828.8125,293.8125 Q828.8125,295.9063 829.5,296.9844 Q830.1875,298.0469 831.5313,298.0469 Q832.1563,298.0469 832.75,297.7813 Q833.3438,297.5 833.9688,296.9219 L833.9688,299.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="845" y="298.1543">C</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="817" x2="855" y1="310" y2="310"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="817" x2="855" y1="318" y2="318"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="60.8047" id="C_0001911193033649971391" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="807.5" y="271.5"/>
-      <ellipse cx="822.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M825.4688,293.1406 Q824.8906,293.4375 824.25,293.5781 Q823.6094,293.7344 822.9063,293.7344 Q820.4063,293.7344 819.0781,292.0938 Q817.7656,290.4375 817.7656,287.3125 Q817.7656,284.1875 819.0781,282.5313 Q820.4063,280.875 822.9063,280.875 Q823.6094,280.875 824.25,281.0313 Q824.9063,281.1875 825.4688,281.4844 L825.4688,284.2031 Q824.8438,283.625 824.25,283.3594 Q823.6563,283.0781 823.0313,283.0781 Q821.6875,283.0781 821,284.1563 Q820.3125,285.2188 820.3125,287.3125 Q820.3125,289.4063 821,290.4844 Q821.6875,291.5469 823.0313,291.5469 Q823.6563,291.5469 824.25,291.2813 Q824.8438,291 825.4688,290.4219 L825.4688,293.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="836.5" y="291.6543">CC</text>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="860.5" y="268.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="861.5" y="280.6387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808.5" x2="865.5" y1="303.5" y2="303.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808.5" x2="865.5" y1="311.5" y2="311.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="60.8047" id="C_0001911193033649971391" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="721.5" y="271.5"/>
+      <ellipse cx="736.5" cy="287.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M739.4688,293.1406 Q738.8906,293.4375 738.25,293.5781 Q737.6094,293.7344 736.9063,293.7344 Q734.4063,293.7344 733.0781,292.0938 Q731.7656,290.4375 731.7656,287.3125 Q731.7656,284.1875 733.0781,282.5313 Q734.4063,280.875 736.9063,280.875 Q737.6094,280.875 738.25,281.0313 Q738.9063,281.1875 739.4688,281.4844 L739.4688,284.2031 Q738.8438,283.625 738.25,283.3594 Q737.6563,283.0781 737.0313,283.0781 Q735.6875,283.0781 735,284.1563 Q734.3125,285.2188 734.3125,287.3125 Q734.3125,289.4063 735,290.4844 Q735.6875,291.5469 737.0313,291.5469 Q737.6563,291.5469 738.25,291.2813 Q738.8438,291 739.4688,290.4219 L739.4688,293.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="750.5" y="291.6543">CC</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="774.5" y="268.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="775.5" y="280.6387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="722.5" x2="779.5" y1="303.5" y2="303.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="722.5" x2="779.5" y1="311.5" y2="311.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#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="813.5" y="317.5"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="815.5" y="319.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#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="727.5" y="317.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="729.5" y="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="827.5" y="325.7104">t : T</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="741.5" y="325.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="73.6094" id="C_0000931278702894205804" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="673.5" y="265"/>
-      <ellipse cx="688.5" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M692.6094,287 L684.8906,287 L684.8906,274.6094 L692.6094,274.6094 L692.6094,276.7656 L687.3438,276.7656 L687.3438,279.4375 L692.1094,279.4375 L692.1094,281.5938 L687.3438,281.5938 L687.3438,284.8438 L692.6094,284.8438 L692.6094,287 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="702.5" y="285.1543">detail::CCC</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="771.5" y1="297" y2="297"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="679.5" y="311.2104">ccc1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="679.5" y="324.0151">ccc2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="771.5" y1="330.6094" y2="330.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="73.6094" id="C_0000931278702894205804" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="630" y="265"/>
+      <ellipse cx="645" cy="281" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M649.1094,287 L641.3906,287 L641.3906,274.6094 L649.1094,274.6094 L649.1094,276.7656 L643.8438,276.7656 L643.8438,279.4375 L648.6094,279.4375 L648.6094,281.5938 L643.8438,281.5938 L643.8438,284.8438 L649.1094,284.8438 L649.1094,287 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="659" y="285.1543">CCC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="631" x2="685" y1="297" y2="297"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="636" y="311.2104">ccc1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="636" y="324.0151">ccc2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="631" x2="685" y1="330.6094" y2="330.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxemavvb3sdrp)" height="86.4141" id="C_0001629943620359873327" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="368.5" y="8"/>
-      <ellipse cx="393.85" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M396.8188,29.6406 Q396.2406,29.9375 395.6,30.0781 Q394.9594,30.2344 394.2563,30.2344 Q391.7563,30.2344 390.4281,28.5938 Q389.1156,26.9375 389.1156,23.8125 Q389.1156,20.6875 390.4281,19.0313 Q391.7563,17.375 394.2563,17.375 Q394.9594,17.375 395.6,17.5313 Q396.2563,17.6875 396.8188,17.9844 L396.8188,20.7031 Q396.1938,20.125 395.6,19.8594 Q395.0063,19.5781 394.3813,19.5781 Q393.0375,19.5781 392.35,20.6563 Q391.6625,21.7188 391.6625,23.8125 Q391.6625,25.9063 392.35,26.9844 Q393.0375,28.0469 394.3813,28.0469 Q395.0063,28.0469 395.6,27.7813 Q396.1938,27.5 396.8188,26.9219 L396.8188,29.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="410.15" y="28.1543">R</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="369.5" x2="430.5" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="369.5" x2="430.5" y1="48" y2="48"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1artwwnois4v7)" height="86.4141" id="C_0001629943620359873327" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="325.5" y="8"/>
+      <ellipse cx="350.85" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M353.8188,29.6406 Q353.2406,29.9375 352.6,30.0781 Q351.9594,30.2344 351.2563,30.2344 Q348.7563,30.2344 347.4281,28.5938 Q346.1156,26.9375 346.1156,23.8125 Q346.1156,20.6875 347.4281,19.0313 Q348.7563,17.375 351.2563,17.375 Q351.9594,17.375 352.6,17.5313 Q353.2563,17.6875 353.8188,17.9844 L353.8188,20.7031 Q353.1938,20.125 352.6,19.8594 Q352.0063,19.5781 351.3813,19.5781 Q350.0375,19.5781 349.35,20.6563 Q348.6625,21.7188 348.6625,23.8125 Q348.6625,25.9063 349.35,26.9844 Q350.0375,28.0469 351.3813,28.0469 Q352.0063,28.0469 352.6,27.7813 Q353.1938,27.5 353.8188,26.9219 L353.8188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="367.15" y="28.1543">R</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="326.5" x2="387.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="326.5" x2="387.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="54"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="56"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="331.5" y="54"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="333.5" y="56"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="388.5" y="62.2104">a : A *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="345.5" y="62.2104">a : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="66.8047"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="68.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="331.5" y="66.8047"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="333.5" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="388.5" y="75.0151">b : B *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L11" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L11" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="345.5" y="75.0151">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="374.5" y="79.6094"/>
-      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="376.5" y="81.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="331.5" y="79.6094"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="333.5" y="81.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="388.5" y="87.8198">c : C *</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L12" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L12" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="345.5" y="87.8198">c : C *</text>
     </a>
-    <path d="M368.16,55.15 C313.35,62.21 200.75,84.15 135,149 C104.94,178.65 90.21,225.51 83.15,259.37 " fill="none" id="C_0001629943620359873327-&gt;C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="82.09,264.68,87.7819,256.6424,83.0733,259.7776,79.9381,255.0691,82.09,264.68" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="166" y="137.0669">-a</text>
-    <path d="M400,94.24 C400,145.04 400,228.91 400,272.58 " fill="none" id="C_0001629943620359873327-&gt;C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="400,277.7,404,268.7,400,272.7,396,268.7,400,277.7" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="401" y="137.0669">-b</text>
-    <path d="M431.81,54.03 C528.8,60.87 818.19,86.23 884,149 C917.72,181.17 923.33,238.36 923.35,272.68 " fill="none" id="C_0001629943620359873327-&gt;C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="923.3,277.98,927.3514,269.003,923.3286,272.9801,919.3515,268.9573,923.3,277.98" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="873" y="137.0669">-c</text>
+    <path d="M325.32,57.74 C277.75,67.95 187.83,93.6 135,149 C105.95,179.46 91.07,225.97 83.7,259.52 " fill="none" id="C_0001629943620359873327-&gt;C_0002210005074053139118" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="82.58,264.78,88.3706,256.8133,83.6237,259.8902,80.5469,255.1433,82.58,264.78" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="161" y="137.0669">-a</text>
+    <path d="M357,94.24 C357,145.04 357,228.91 357,272.58 " fill="none" id="C_0001629943620359873327-&gt;C_0001319862510251967999" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="357,277.7,361,268.7,357,272.7,353,268.7,357,277.7" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="358" y="137.0669">-b</text>
+    <path d="M388.56,54.68 C479.42,63.04 738.9,91.56 798,149 C831.33,181.39 837.1,238.25 837.25,272.49 " fill="none" id="C_0001629943620359873327-&gt;C_0001697463991772603674" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="837.22,277.79,841.2457,268.8015,837.2343,272.79,833.2457,268.7786,837.22,277.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="788" y="137.0669">-c</text>
   </g>
 </svg>
diff --git a/docs/test_cases/t00071_class_mermaid.svg b/docs/test_cases/t00071_class_mermaid.svg
index 5997bb50..5b1d9718 100644
--- a/docs/test_cases/t00071_class_mermaid.svg
+++ b/docs/test_cases/t00071_class_mermaid.svg
@@ -90,7 +90,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(725.2265625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L4">
+        <a transform="translate(725.2265625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001319862510251967999-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,7 +109,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(41.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L6">
+        <a transform="translate(41.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0000569632796637866961-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -133,7 +133,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(185.453125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1.cppm#L11">
+        <a transform="translate(185.453125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1.cppm#L11">
           <g title="BBB" id="classId-C_0001625078061541942293-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(309.609375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1mod1.cppm#L4">
+        <a transform="translate(309.609375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1mod1.cppm#L4">
           <g title="D" id="classId-C_0001168777064323042894-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -181,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(385.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib1mod2.cppm#L4">
+        <a transform="translate(385.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib1mod2.cppm#L4">
           <g title="E" id="classId-C_0001302694761523535504-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -200,7 +200,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(801.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L4">
+        <a transform="translate(801.7890625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L4">
           <g title="C" id="classId-C_0001697463991772603674-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(481.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L6">
+        <a transform="translate(481.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L6">
           <g title="CC" id="classId-C_0001911193033649971391-6" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -243,7 +243,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(626.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/lib2.cppm#L11">
+        <a transform="translate(626.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/lib2.cppm#L11">
           <g title="CCC" id="classId-C_0000931278702894205804-7" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -272,7 +272,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(620.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/src/t00071_mod.cppm#L6">
+        <a transform="translate(620.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/src/t00071_mod.cppm#L6">
           <g title="A" id="classId-C_0002210005074053139118-8" class="node default clickable">
             <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
@@ -301,7 +301,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(763.5078125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00071/t00071.cc#L9">
+        <a transform="translate(763.5078125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00071/t00071.cc#L9">
           <g title="R" id="classId-C_0001629943620359873327-9" class="node default clickable">
             <rect height="123" width="53.234375" y="-61.5" x="-26.6171875" class="outer title-state"/>
             <line y2="-31.5" y1="-31.5" x2="26.6171875" x1="-26.6171875" class="divider"/>
diff --git a/docs/test_cases/t00072.md b/docs/test_cases/t00072.md
index 1e0137d5..662c3002 100644
--- a/docs/test_cases/t00072.md
+++ b/docs/test_cases/t00072.md
@@ -180,7 +180,7 @@ class D { };
                 "bbb1",
                 "bbb2"
               ],
-              "display_name": "detail::BBB",
+              "display_name": "BBB",
               "id": "610293402618118513",
               "is_nested": false,
               "module": {
@@ -347,7 +347,7 @@ class D { };
                 "ccc1",
                 "ccc2"
               ],
-              "display_name": "detail::CCC",
+              "display_name": "CCC",
               "id": "448885573685763285",
               "is_nested": false,
               "module": {
@@ -394,6 +394,7 @@ class D { };
           "methods": [
             {
               "access": "private",
+              "display_name": "get",
               "is_const": false,
               "is_consteval": false,
               "is_constexpr": false,
@@ -416,6 +417,7 @@ class D { };
                 "line": 9,
                 "translation_unit": "t00072.cc"
               },
+              "template_parameters": [],
               "type": "int"
             }
           ],
diff --git a/docs/test_cases/t00072_class.svg b/docs/test_cases/t00072_class.svg
index 25d24cce..ee92ed73 100644
--- a/docs/test_cases/t00072_class.svg
+++ b/docs/test_cases/t00072_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="392px" preserveAspectRatio="none" style="width:736px;height:392px;" version="1.1" viewBox="0 0 736 392" width="736px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fazsy1fcsqwok" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1nfz1gs0gv1wg" 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>
-    <polygon fill="#FFFFFF" filter="url(#fazsy1fcsqwok)" points="22,24,57,24,64,46.2969,714,46.2969,714,380,22,380,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1nfz1gs0gv1wg)" points="22,24,57,24,64,46.2969,714,46.2969,714,380,22,380,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
-    <polygon fill="#FFFFFF" filter="url(#fazsy1fcsqwok)" points="326,67,366,67,373,89.2969,690,89.2969,690,356,326,356,326,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1nfz1gs0gv1wg)" points="326,67,366,67,373,89.2969,690,89.2969,690,356,326,356,326,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="326" x2="373" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="330" y="81.9951">:lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#fazsy1fcsqwok)" points="592,110,642,110,649,132.2969,666,132.2969,666,209,592,209,592,110" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1nfz1gs0gv1wg)" points="592,110,642,110,649,132.2969,666,132.2969,666,209,592,209,592,110" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="592" x2="649" y1="132.2969" y2="132.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="596" y="124.9951">mod1</text>
-    <polygon fill="#FFFFFF" filter="url(#fazsy1fcsqwok)" points="496,110,546,110,553,132.2969,568,132.2969,568,209,496,209,496,110" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1nfz1gs0gv1wg)" points="496,110,546,110,553,132.2969,568,132.2969,568,209,496,209,496,110" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="496" x2="553" y1="132.2969" y2="132.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="500" y="124.9951">mod2</text>
-    <polygon fill="#FFFFFF" filter="url(#fazsy1fcsqwok)" points="135,103.5,175,103.5,182,125.7969,302,125.7969,302,356,135,356,135,103.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1nfz1gs0gv1wg)" points="135,103.5,175,103.5,182,125.7969,302,125.7969,302,356,135,356,135,103.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="135" x2="182" y1="125.7969" y2="125.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="139" y="118.4951">:lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="73.6094" id="C_0001552096180171121044" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="132"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="73.6094" id="C_0001552096180171121044" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="38" y="132"/>
       <ellipse cx="70.1" cy="148" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M73.0688,153.6406 Q72.4906,153.9375 71.85,154.0781 Q71.2094,154.2344 70.5063,154.2344 Q68.0063,154.2344 66.6781,152.5938 Q65.3656,150.9375 65.3656,147.8125 Q65.3656,144.6875 66.6781,143.0313 Q68.0063,141.375 70.5063,141.375 Q71.2094,141.375 71.85,141.5313 Q72.5063,141.6875 73.0688,141.9844 L73.0688,144.7031 Q72.4438,144.125 71.85,143.8594 Q71.2563,143.5781 70.6313,143.5781 Q69.2875,143.5781 68.6,144.6563 Q67.9125,145.7188 67.9125,147.8125 Q67.9125,149.9063 68.6,150.9844 Q69.2875,152.0469 70.6313,152.0469 Q71.2563,152.0469 71.85,151.7813 Q72.4438,151.5 73.0688,150.9219 L73.0688,153.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="87.9" y="152.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="164" y2="164"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="44" y="170"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="172"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L9" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L9" xlink:show="new" xlink:title="get" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="58" y="178.2104">get() : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="39" x2="115" y1="184.8047" y2="184.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#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="44" y="190.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="46" y="192.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="58" y="199.0151">a : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="48" id="C_0001450150421445257774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="342" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="48" id="C_0001450150421445257774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="342" y="145"/>
       <ellipse cx="357" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M359.9688,166.6406 Q359.3906,166.9375 358.75,167.0781 Q358.1094,167.2344 357.4063,167.2344 Q354.9063,167.2344 353.5781,165.5938 Q352.2656,163.9375 352.2656,160.8125 Q352.2656,157.6875 353.5781,156.0313 Q354.9063,154.375 357.4063,154.375 Q358.1094,154.375 358.75,154.5313 Q359.4063,154.6875 359.9688,154.9844 L359.9688,157.7031 Q359.3438,157.125 358.75,156.8594 Q358.1563,156.5781 357.5313,156.5781 Q356.1875,156.5781 355.5,157.6563 Q354.8125,158.7188 354.8125,160.8125 Q354.8125,162.9063 355.5,163.9844 Q356.1875,165.0469 357.5313,165.0469 Q358.1563,165.0469 358.75,164.7813 Q359.3438,164.5 359.9688,163.9219 L359.9688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="371" y="165.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="381" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="381" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="60.8047" id="C_0000744925471008373109" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="417.5" y="138.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L6" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L6" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="60.8047" id="C_0000744925471008373109" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="417.5" y="138.5"/>
       <ellipse cx="432.5" cy="154.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M435.4688,160.1406 Q434.8906,160.4375 434.25,160.5781 Q433.6094,160.7344 432.9063,160.7344 Q430.4063,160.7344 429.0781,159.0938 Q427.7656,157.4375 427.7656,154.3125 Q427.7656,151.1875 429.0781,149.5313 Q430.4063,147.875 432.9063,147.875 Q433.6094,147.875 434.25,148.0313 Q434.9063,148.1875 435.4688,148.4844 L435.4688,151.2031 Q434.8438,150.625 434.25,150.3594 Q433.6563,150.0781 433.0313,150.0781 Q431.6875,150.0781 431,151.1563 Q430.3125,152.2188 430.3125,154.3125 Q430.3125,156.4063 431,157.4844 Q431.6875,158.5469 433.0313,158.5469 Q433.6563,158.5469 434.25,158.2813 Q434.8438,158 435.4688,157.4219 L435.4688,160.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="446.5" y="158.6543">BB</text>
@@ -64,49 +64,49 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="418.5" x2="475.5" y1="170.5" y2="170.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="418.5" x2="475.5" y1="178.5" y2="178.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#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="423.5" y="184.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="425.5" y="186.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="437.5" y="192.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="73.6094" id="C_0000610293402618118513" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="342.5" y="266"/>
-      <ellipse cx="357.5" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M361.6094,288 L353.8906,288 L353.8906,275.6094 L361.6094,275.6094 L361.6094,277.7656 L356.3438,277.7656 L356.3438,280.4375 L361.1094,280.4375 L361.1094,282.5938 L356.3438,282.5938 L356.3438,285.8438 L361.6094,285.8438 L361.6094,288 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="371.5" y="286.1543">detail::BBB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343.5" x2="440.5" y1="298" y2="298"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="348.5" y="312.2104">bbb1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="348.5" y="325.0151">bbb2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343.5" x2="440.5" y1="331.6094" y2="331.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L11" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L11" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="73.6094" id="C_0000610293402618118513" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="342" y="266"/>
+      <ellipse cx="357" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M361.1094,288 L353.3906,288 L353.3906,275.6094 L361.1094,275.6094 L361.1094,277.7656 L355.8438,277.7656 L355.8438,280.4375 L360.6094,280.4375 L360.6094,282.5938 L355.8438,282.5938 L355.8438,285.8438 L361.1094,285.8438 L361.1094,288 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="371" y="286.1543">BBB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="397" y1="298" y2="298"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="348" y="312.2104">bbb1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="348" y="325.0151">bbb2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="343" x2="397" y1="331.6094" y2="331.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="48" id="C_0000516204432765266678" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="608.5" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1mod1.cppm#L4" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="48" id="C_0000516204432765266678" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="608.5" y="145"/>
       <ellipse cx="623.5" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M626.4688,166.6406 Q625.8906,166.9375 625.25,167.0781 Q624.6094,167.2344 623.9063,167.2344 Q621.4063,167.2344 620.0781,165.5938 Q618.7656,163.9375 618.7656,160.8125 Q618.7656,157.6875 620.0781,156.0313 Q621.4063,154.375 623.9063,154.375 Q624.6094,154.375 625.25,154.5313 Q625.9063,154.6875 626.4688,154.9844 L626.4688,157.7031 Q625.8438,157.125 625.25,156.8594 Q624.6563,156.5781 624.0313,156.5781 Q622.6875,156.5781 622,157.6563 Q621.3125,158.7188 621.3125,160.8125 Q621.3125,162.9063 622,163.9844 Q622.6875,165.0469 624.0313,165.0469 Q624.6563,165.0469 625.25,164.7813 Q625.8438,164.5 626.4688,163.9219 L626.4688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="637.5" y="165.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="648.5" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="648.5" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="48" id="C_0000347204883768272660" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="512" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1mod2.cppm#L4" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="48" id="C_0000347204883768272660" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="512" y="145"/>
       <ellipse cx="527" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M529.9688,166.6406 Q529.3906,166.9375 528.75,167.0781 Q528.1094,167.2344 527.4063,167.2344 Q524.9063,167.2344 523.5781,165.5938 Q522.2656,163.9375 522.2656,160.8125 Q522.2656,157.6875 523.5781,156.0313 Q524.9063,154.375 527.4063,154.375 Q528.1094,154.375 528.75,154.5313 Q529.4063,154.6875 529.9688,154.9844 L529.9688,157.7031 Q529.3438,157.125 528.75,156.8594 Q528.1563,156.5781 527.5313,156.5781 Q526.1875,156.5781 525.5,157.6563 Q524.8125,158.7188 524.8125,160.8125 Q524.8125,162.9063 525.5,163.9844 Q526.1875,165.0469 527.5313,165.0469 Q528.1563,165.0469 528.75,164.7813 Q529.3438,164.5 529.9688,163.9219 L529.9688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="541" y="165.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="513" x2="551" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="513" x2="551" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="48" id="C_0001144612141363797057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="151" y="145"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L4" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L4" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="48" id="C_0001144612141363797057" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="151" y="145"/>
       <ellipse cx="166" cy="161" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M168.9688,166.6406 Q168.3906,166.9375 167.75,167.0781 Q167.1094,167.2344 166.4063,167.2344 Q163.9063,167.2344 162.5781,165.5938 Q161.2656,163.9375 161.2656,160.8125 Q161.2656,157.6875 162.5781,156.0313 Q163.9063,154.375 166.4063,154.375 Q167.1094,154.375 167.75,154.5313 Q168.4063,154.6875 168.9688,154.9844 L168.9688,157.7031 Q168.3438,157.125 167.75,156.8594 Q167.1563,156.5781 166.5313,156.5781 Q165.1875,156.5781 164.5,157.6563 Q163.8125,158.7188 163.8125,160.8125 Q163.8125,162.9063 164.5,163.9844 Q165.1875,165.0469 166.5313,165.0469 Q167.1563,165.0469 167.75,164.7813 Q168.3438,164.5 168.9688,163.9219 L168.9688,166.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="180" y="165.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="190" y1="177" y2="177"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="190" y1="185" y2="185"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="60.8047" id="C_0001472938318775327089" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="226.5" y="138.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L6" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L6" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="60.8047" id="C_0001472938318775327089" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="226.5" y="138.5"/>
       <ellipse cx="241.5" cy="154.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M244.4688,160.1406 Q243.8906,160.4375 243.25,160.5781 Q242.6094,160.7344 241.9063,160.7344 Q239.4063,160.7344 238.0781,159.0938 Q236.7656,157.4375 236.7656,154.3125 Q236.7656,151.1875 238.0781,149.5313 Q239.4063,147.875 241.9063,147.875 Q242.6094,147.875 243.25,148.0313 Q243.9063,148.1875 244.4688,148.4844 L244.4688,151.2031 Q243.8438,150.625 243.25,150.3594 Q242.6563,150.0781 242.0313,150.0781 Q240.6875,150.0781 240,151.1563 Q239.3125,152.2188 239.3125,154.3125 Q239.3125,156.4063 240,157.4844 Q240.6875,158.5469 242.0313,158.5469 Q242.6563,158.5469 243.25,158.2813 Q243.8438,158 244.4688,157.4219 L244.4688,160.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="255.5" y="158.6543">CC</text>
@@ -115,22 +115,22 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="227.5" x2="284.5" y1="170.5" y2="170.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="227.5" x2="284.5" y1="178.5" y2="178.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#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="232.5" y="184.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="234.5" y="186.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="246.5" y="192.7104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fazsy1fcsqwok)" height="73.6094" id="C_0000448885573685763285" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="151.5" y="266"/>
-      <ellipse cx="166.5" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M170.6094,288 L162.8906,288 L162.8906,275.6094 L170.6094,275.6094 L170.6094,277.7656 L165.3438,277.7656 L165.3438,280.4375 L170.1094,280.4375 L170.1094,282.5938 L165.3438,282.5938 L165.3438,285.8438 L170.6094,285.8438 L170.6094,288 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="67" x="180.5" y="286.1543">detail::CCC</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="298" y2="298"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="157.5" y="312.2104">ccc1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="157.5" y="325.0151">ccc2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152.5" x2="249.5" y1="331.6094" y2="331.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L11" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L11" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nfz1gs0gv1wg)" height="73.6094" id="C_0000448885573685763285" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="151" y="266"/>
+      <ellipse cx="166" cy="282" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M170.1094,288 L162.3906,288 L162.3906,275.6094 L170.1094,275.6094 L170.1094,277.7656 L164.8438,277.7656 L164.8438,280.4375 L169.6094,280.4375 L169.6094,282.5938 L164.8438,282.5938 L164.8438,285.8438 L170.1094,285.8438 L170.1094,288 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="180" y="286.1543">CCC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="206" y1="298" y2="298"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="157" y="312.2104">ccc1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="157" y="325.0151">ccc2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="152" x2="206" y1="331.6094" y2="331.6094"/>
     </a>
   </g>
 </svg>
diff --git a/docs/test_cases/t00072_class_mermaid.svg b/docs/test_cases/t00072_class_mermaid.svg
index a5ff8a6d..9c4b5889 100644
--- a/docs/test_cases/t00072_class_mermaid.svg
+++ b/docs/test_cases/t00072_class_mermaid.svg
@@ -52,7 +52,7 @@
       <g class="edgePaths"/>
       <g class="edgeLabels"/>
       <g class="nodes">
-        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L4">
+        <a transform="translate(21.28125, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L4">
           <g title="B" id="classId-C_0001450150421445257774-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -71,7 +71,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L6">
+        <a transform="translate(117.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L6">
           <g title="BB" id="classId-C_0000744925471008373109-1" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -95,7 +95,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1.cppm#L11">
+        <a transform="translate(262.015625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1.cppm#L11">
           <g title="BBB" id="classId-C_0000610293402618118513-2" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -124,7 +124,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(386.171875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1mod1.cppm#L4">
+        <a transform="translate(386.171875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1mod1.cppm#L4">
           <g title="D" id="classId-C_0000516204432765266678-3" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -143,7 +143,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(462.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib1mod2.cppm#L4">
+        <a transform="translate(462.2890625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib1mod2.cppm#L4">
           <g title="E" id="classId-C_0000347204883768272660-4" class="node default clickable">
             <rect height="57" width="25.671875" y="-28.5" x="-12.8359375" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -162,7 +162,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(538.40625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L4">
+        <a transform="translate(538.40625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L4">
           <g title="C" id="classId-C_0001144612141363797057-5" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -181,7 +181,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(634.9765625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L6">
+        <a transform="translate(634.9765625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L6">
           <g title="CC" id="classId-C_0001472938318775327089-6" class="node default clickable">
             <rect height="79" width="66.578125" y="-39.5" x="-33.2890625" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="33.2890625" x1="-33.2890625" class="divider"/>
@@ -205,7 +205,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(779.140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/lib2.cppm#L11">
+        <a transform="translate(779.140625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/lib2.cppm#L11">
           <g title="CCC" id="classId-C_0000448885573685763285-7" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -234,7 +234,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(931.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00072/src/t00072_mod.cppm#L8">
+        <a transform="translate(931.75, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00072/src/t00072_mod.cppm#L8">
           <g title="A" id="classId-C_0001552096180171121044-8" class="node default clickable">
             <rect height="101" width="83.46875" y="-50.5" x="-41.734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="41.734375" x1="-41.734375" class="divider"/>
diff --git a/docs/test_cases/t00073.md b/docs/test_cases/t00073.md
index 3a6ef4fc..acca766c 100644
--- a/docs/test_cases/t00073.md
+++ b/docs/test_cases/t00073.md
@@ -83,6 +83,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "handle",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -110,10 +111,12 @@ struct R {
             "line": 5,
             "translation_unit": "t00073.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "operator()",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -141,6 +144,7 @@ struct R {
             "line": 6,
             "translation_unit": "t00073.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -190,6 +194,7 @@ struct R {
       "methods": [
         {
           "access": "public",
+          "display_name": "handle",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -217,10 +222,12 @@ struct R {
             "line": 11,
             "translation_unit": "t00073.cc"
           },
+          "template_parameters": [],
           "type": "void"
         },
         {
           "access": "public",
+          "display_name": "operator()",
           "is_const": true,
           "is_consteval": false,
           "is_constexpr": false,
@@ -248,6 +255,7 @@ struct R {
             "line": 12,
             "translation_unit": "t00073.cc"
           },
+          "template_parameters": [],
           "type": "void"
         }
       ],
@@ -328,13 +336,13 @@ struct R {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00073::AHandler"
+          "type": "AHandler"
         },
         {
           "is_variadic": false,
           "kind": "argument",
           "template_parameters": [],
-          "type": "clanguml::t00073::BHandler"
+          "type": "BHandler"
         }
       ],
       "type": "class"
diff --git a/docs/test_cases/t00073_class.svg b/docs/test_cases/t00073_class.svg
index dfecdb9d..cb0aceb5 100644
--- a/docs/test_cases/t00073_class.svg
+++ b/docs/test_cases/t00073_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="335px" preserveAspectRatio="none" style="width:736px;height:335px;" version="1.1" viewBox="0 0 736 335" width="736px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fm5vf0ksijobp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1gfwvvt5bl4yl" 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,70 +9,70 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm5vf0ksijobp)" height="48" id="C_0001747277620916743482" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="82.5" y="167"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gfwvvt5bl4yl)" height="48" id="C_0001747277620916743482" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="82.5" y="167"/>
       <ellipse cx="97.5" cy="183" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M100.4688,188.6406 Q99.8906,188.9375 99.25,189.0781 Q98.6094,189.2344 97.9063,189.2344 Q95.4063,189.2344 94.0781,187.5938 Q92.7656,185.9375 92.7656,182.8125 Q92.7656,179.6875 94.0781,178.0313 Q95.4063,176.375 97.9063,176.375 Q98.6094,176.375 99.25,176.5313 Q99.9063,176.6875 100.4688,176.9844 L100.4688,179.7031 Q99.8438,179.125 99.25,178.8594 Q98.6563,178.5781 98.0313,178.5781 Q96.6875,178.5781 96,179.6563 Q95.3125,180.7188 95.3125,182.8125 Q95.3125,184.9063 96,185.9844 Q96.6875,187.0469 98.0313,187.0469 Q98.6563,187.0469 99.25,186.7813 Q99.8438,186.5 100.4688,185.9219 L100.4688,188.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="111.5" y="187.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="83.5" x2="121.5" y1="199" y2="199"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="83.5" x2="121.5" y1="207" y2="207"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L4" target="_top" title="AHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L4" xlink:show="new" xlink:title="AHandler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm5vf0ksijobp)" height="81.6094" id="C_0001553077875896883107" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L4" target="_top" title="AHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L4" xlink:show="new" xlink:title="AHandler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gfwvvt5bl4yl)" height="81.6094" id="C_0001553077875896883107" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="6" y="8"/>
       <ellipse cx="69.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M72.7188,29.6406 Q72.1406,29.9375 71.5,30.0781 Q70.8594,30.2344 70.1563,30.2344 Q67.6563,30.2344 66.3281,28.5938 Q65.0156,26.9375 65.0156,23.8125 Q65.0156,20.6875 66.3281,19.0313 Q67.6563,17.375 70.1563,17.375 Q70.8594,17.375 71.5,17.5313 Q72.1563,17.6875 72.7188,17.9844 L72.7188,20.7031 Q72.0938,20.125 71.5,19.8594 Q70.9063,19.5781 70.2813,19.5781 Q68.9375,19.5781 68.25,20.6563 Q67.5625,21.7188 67.5625,23.8125 Q67.5625,25.9063 68.25,26.9844 Q68.9375,28.0469 70.2813,28.0469 Q70.9063,28.0469 71.5,27.7813 Q72.0938,27.5 72.7188,26.9219 L72.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="90.25" y="28.1543">AHandler</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="198" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L6" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L6" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L6" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L6" xlink:show="new" xlink:title="operator()" 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="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L6" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L6" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L6" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L6" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="167" x="26" y="54.2104">operator()(A &amp; a) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="7" x2="198" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L5" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L5" xlink:show="new" xlink:title="handle" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L5" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L5" xlink:show="new" xlink:title="handle" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
       <ellipse cx="17" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L5" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L5" xlink:show="new" xlink:title="handle" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L5" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L5" xlink:show="new" xlink:title="handle" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="26" y="75.0151">handle(A &amp; a) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="198" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm5vf0ksijobp)" height="48" id="C_0002289864660191173413" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="608.5" y="167"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gfwvvt5bl4yl)" height="48" id="C_0002289864660191173413" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="608.5" y="167"/>
       <ellipse cx="623.5" cy="183" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M626.4688,188.6406 Q625.8906,188.9375 625.25,189.0781 Q624.6094,189.2344 623.9063,189.2344 Q621.4063,189.2344 620.0781,187.5938 Q618.7656,185.9375 618.7656,182.8125 Q618.7656,179.6875 620.0781,178.0313 Q621.4063,176.375 623.9063,176.375 Q624.6094,176.375 625.25,176.5313 Q625.9063,176.6875 626.4688,176.9844 L626.4688,179.7031 Q625.8438,179.125 625.25,178.8594 Q624.6563,178.5781 624.0313,178.5781 Q622.6875,178.5781 622,179.6563 Q621.3125,180.7188 621.3125,182.8125 Q621.3125,184.9063 622,185.9844 Q622.6875,187.0469 624.0313,187.0469 Q624.6563,187.0469 625.25,186.7813 Q625.8438,186.5 626.4688,185.9219 L626.4688,188.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="637.5" y="187.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="647.5" y1="199" y2="199"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="609.5" x2="647.5" y1="207" y2="207"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L10" target="_top" title="BHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L10" xlink:show="new" xlink:title="BHandler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm5vf0ksijobp)" height="81.6094" id="C_0001150176578121877194" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="531.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L10" target="_top" title="BHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L10" xlink:show="new" xlink:title="BHandler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gfwvvt5bl4yl)" height="81.6094" id="C_0001150176578121877194" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="531.5" y="8"/>
       <ellipse cx="595.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M598.7188,29.6406 Q598.1406,29.9375 597.5,30.0781 Q596.8594,30.2344 596.1563,30.2344 Q593.6563,30.2344 592.3281,28.5938 Q591.0156,26.9375 591.0156,23.8125 Q591.0156,20.6875 592.3281,19.0313 Q593.6563,17.375 596.1563,17.375 Q596.8594,17.375 597.5,17.5313 Q598.1563,17.6875 598.7188,17.9844 L598.7188,20.7031 Q598.0938,20.125 597.5,19.8594 Q596.9063,19.5781 596.2813,19.5781 Q594.9375,19.5781 594.25,20.6563 Q593.5625,21.7188 593.5625,23.8125 Q593.5625,25.9063 594.25,26.9844 Q594.9375,28.0469 596.2813,28.0469 Q596.9063,28.0469 597.5,27.7813 Q598.0938,27.5 598.7188,26.9219 L598.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="616.25" y="28.1543">BHandler</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="532.5" x2="724.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="537.5" y="46"/>
       <ellipse cx="542.5" cy="51" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L12" target="_top" title="operator()" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L12" xlink:show="new" xlink:title="operator()" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="168" x="551.5" y="54.2104">operator()(B &amp; b) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="532.5" x2="724.5" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L11" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L11" xlink:show="new" xlink:title="handle" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L11" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L11" xlink:show="new" xlink:title="handle" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="537.5" y="66.8047"/>
       <ellipse cx="542.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L11" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L11" xlink:show="new" xlink:title="handle" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L11" target="_top" title="handle" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L11" xlink:show="new" xlink:title="handle" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="551.5" y="75.0151">handle(B &amp; b) const : void</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="532.5" x2="724.5" y1="81.6094" y2="81.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L15" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L15" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm5vf0ksijobp)" height="48" id="C_0000128238421290776639" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="296" y="276"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L15" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L15" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gfwvvt5bl4yl)" height="48" id="C_0000128238421290776639" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="296" y="276"/>
       <ellipse cx="311" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M313.9688,297.6406 Q313.3906,297.9375 312.75,298.0781 Q312.1094,298.2344 311.4063,298.2344 Q308.9063,298.2344 307.5781,296.5938 Q306.2656,294.9375 306.2656,291.8125 Q306.2656,288.6875 307.5781,287.0313 Q308.9063,285.375 311.4063,285.375 Q312.1094,285.375 312.75,285.5313 Q313.4063,285.6875 313.9688,285.9844 L313.9688,288.7031 Q313.3438,288.125 312.75,287.8594 Q312.1563,287.5781 311.5313,287.5781 Q310.1875,287.5781 309.5,288.6563 Q308.8125,289.7188 308.8125,291.8125 Q308.8125,293.9063 309.5,294.9844 Q310.1875,296.0469 311.5313,296.0469 Q312.1563,296.0469 312.75,295.7813 Q313.3438,295.5 313.9688,294.9219 L313.9688,297.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="325" y="296.1543">Overload</text>
@@ -81,8 +81,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="297" x2="434" y1="308" y2="308"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="297" x2="434" y1="316" y2="316"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L15" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L15" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm5vf0ksijobp)" height="48" id="C_0001942698483892029961" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="261" y="167"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L15" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L15" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gfwvvt5bl4yl)" height="48" id="C_0001942698483892029961" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="261" y="167"/>
       <ellipse cx="276" cy="183" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M278.9688,188.6406 Q278.3906,188.9375 277.75,189.0781 Q277.1094,189.2344 276.4063,189.2344 Q273.9063,189.2344 272.5781,187.5938 Q271.2656,185.9375 271.2656,182.8125 Q271.2656,179.6875 272.5781,178.0313 Q273.9063,176.375 276.4063,176.375 Q277.1094,176.375 277.75,176.5313 Q278.4063,176.6875 278.9688,176.9844 L278.9688,179.7031 Q278.3438,179.125 277.75,178.8594 Q277.1563,178.5781 276.5313,178.5781 Q275.1875,178.5781 274.5,179.6563 Q273.8125,180.7188 273.8125,182.8125 Q273.8125,184.9063 274.5,185.9844 Q275.1875,187.0469 276.5313,187.0469 Q277.1563,187.0469 277.75,186.7813 Q278.3438,186.5 278.9688,185.9219 L278.9688,188.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="290" y="187.1543">Overload</text>
@@ -91,19 +91,19 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="262" x2="469" y1="199" y2="199"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="262" x2="469" y1="207" y2="207"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm5vf0ksijobp)" height="60.8047" id="C_0000441440190371151626" style="stroke: #A80036; stroke-width: 1.5;" width="262" x="234.5" y="18.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gfwvvt5bl4yl)" height="60.8047" id="C_0000441440190371151626" style="stroke: #A80036; stroke-width: 1.5;" width="262" x="234.5" y="18.5"/>
       <ellipse cx="357.25" cy="34.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M360.2188,40.1406 Q359.6406,40.4375 359,40.5781 Q358.3594,40.7344 357.6563,40.7344 Q355.1563,40.7344 353.8281,39.0938 Q352.5156,37.4375 352.5156,34.3125 Q352.5156,31.1875 353.8281,29.5313 Q355.1563,27.875 357.6563,27.875 Q358.3594,27.875 359,28.0313 Q359.6563,28.1875 360.2188,28.4844 L360.2188,31.2031 Q359.5938,30.625 359,30.3594 Q358.4063,30.0781 357.7813,30.0781 Q356.4375,30.0781 355.75,31.1563 Q355.0625,32.2188 355.0625,34.3125 Q355.0625,36.4063 355.75,37.4844 Q356.4375,38.5469 357.7813,38.5469 Q358.4063,38.5469 359,38.2813 Q359.5938,38 360.2188,37.4219 L360.2188,40.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="377.75" y="38.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235.5" x2="495.5" y1="50.5" y2="50.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235.5" x2="495.5" y1="58.5" y2="58.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L21" target="_top" title="dispatch" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L21" xlink:show="new" xlink:title="dispatch" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L21" target="_top" title="dispatch" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L21" xlink:show="new" xlink:title="dispatch" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="240.5" y="64.5"/>
       <ellipse cx="245.5" cy="69.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L21" target="_top" title="dispatch" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L21" xlink:show="new" xlink:title="dispatch" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L21" target="_top" title="dispatch" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L21" xlink:show="new" xlink:title="dispatch" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="254.5" y="72.7104">dispatch : Overload&lt;AHandler,BHandler&gt;</text>
     </a>
     <path d="M102.5,90.12 C102.5,113.06 102.5,141.27 102.5,161.86 " fill="none" id="C_0001553077875896883107-&gt;C_0001747277620916743482" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00073_class_mermaid.svg b/docs/test_cases/t00073_class_mermaid.svg
index 91b6ffe4..db65ea53 100644
--- a/docs/test_cases/t00073_class_mermaid.svg
+++ b/docs/test_cases/t00073_class_mermaid.svg
@@ -122,7 +122,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(82.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L3">
+        <a transform="translate(82.1640625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L3">
           <g title="A" id="classId-C_0001747277620916743482-0" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -141,7 +141,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(130.4453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L4">
+        <a transform="translate(130.4453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L4">
           <g title="AHandler" id="classId-C_0001553077875896883107-1" class="node default clickable">
             <rect height="101" width="244.890625" y="-50.5" x="-122.4453125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="122.4453125" x1="-122.4453125" class="divider"/>
@@ -170,7 +170,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(268.33203125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L9">
+        <a transform="translate(268.33203125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L9">
           <g title="B" id="classId-C_0002289864660191173413-2" class="node default clickable">
             <rect height="57" width="26.5625" y="-28.5" x="-13.28125" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -189,7 +189,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(426.21875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L10">
+        <a transform="translate(426.21875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L10">
           <g title="BHandler" id="classId-C_0001150176578121877194-3" class="node default clickable">
             <rect height="101" width="246.65625" y="-50.5" x="-123.328125" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="123.328125" x1="-123.328125" class="divider"/>
@@ -218,7 +218,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(694.0078125, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L15">
+        <a transform="translate(694.0078125, 312.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L15">
           <g title="Overload" id="classId-C_0000128238421290776639-4" class="node default clickable">
             <rect height="57" width="163.53125" y="-28.5" x="-81.765625" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="81.765625" x1="-81.765625" class="divider"/>
@@ -237,7 +237,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(694.0078125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L15">
+        <a transform="translate(694.0078125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L15">
           <g title="Overload" id="classId-C_0001942698483892029961-5" class="node default clickable">
             <rect height="57" width="248.859375" y="-28.5" x="-124.4296875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="124.4296875" x1="-124.4296875" class="divider"/>
@@ -256,7 +256,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(758.4765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00073/t00073.cc#L20">
+        <a transform="translate(758.4765625, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00073/t00073.cc#L20">
           <g title="R" id="classId-C_0000441440190371151626-6" class="node default clickable">
             <rect height="79" width="317.859375" y="-39.5" x="-158.9296875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="158.9296875" x1="-158.9296875" class="divider"/>
diff --git a/docs/test_cases/t00074_class.svg b/docs/test_cases/t00074_class.svg
index 939d7b89..5f2833df 100644
--- a/docs/test_cases/t00074_class.svg
+++ b/docs/test_cases/t00074_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="203px" preserveAspectRatio="none" style="width:263px;height:203px;" version="1.1" viewBox="0 0 263 203" width="263px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1843ug6opnv9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgoj9ly8t3nj9" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L4" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L4" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1843ug6opnv9)" height="53.9375" id="C_0000486119377394642787" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="75" y="139"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L4" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L4" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgoj9ly8t3nj9)" height="53.9375" id="C_0000486119377394642787" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="75" y="139"/>
       <ellipse cx="90" cy="157.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M92.9688,163.6094 Q92.3906,163.9063 91.75,164.0469 Q91.1094,164.2031 90.4063,164.2031 Q87.9063,164.2031 86.5781,162.5625 Q85.2656,160.9063 85.2656,157.7813 Q85.2656,154.6563 86.5781,153 Q87.9063,151.3438 90.4063,151.3438 Q91.1094,151.3438 91.75,151.5 Q92.4063,151.6563 92.9688,151.9531 L92.9688,154.6719 Q92.3438,154.0938 91.75,153.8281 Q91.1563,153.5469 90.5313,153.5469 Q89.1875,153.5469 88.5,154.625 Q87.8125,155.6875 87.8125,157.7813 Q87.8125,159.875 88.5,160.9531 Q89.1875,162.0156 90.5313,162.0156 Q91.1563,162.0156 91.75,161.75 Q92.3438,161.4688 92.9688,160.8906 L92.9688,163.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="102" y="155.1387">«concept»</text>
@@ -20,8 +20,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="76" x2="178" y1="176.9375" y2="176.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="76" x2="178" y1="184.9375" y2="184.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L10" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L10" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1843ug6opnv9)" height="53.9375" id="C_0000560253541144761762" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L10" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L10" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgoj9ly8t3nj9)" height="53.9375" id="C_0000560253541144761762" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="6" y="8"/>
       <ellipse cx="21" cy="26.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,32.6094 Q23.3906,32.9063 22.75,33.0469 Q22.1094,33.2031 21.4063,33.2031 Q18.9063,33.2031 17.5781,31.5625 Q16.2656,29.9063 16.2656,26.7813 Q16.2656,23.6563 17.5781,22 Q18.9063,20.3438 21.4063,20.3438 Q22.1094,20.3438 22.75,20.5 Q23.4063,20.6563 23.9688,20.9531 L23.9688,23.6719 Q23.3438,23.0938 22.75,22.8281 Q22.1563,22.5469 21.5313,22.5469 Q20.1875,22.5469 19.5,23.625 Q18.8125,24.6875 18.8125,26.7813 Q18.8125,28.875 19.5,29.9531 Q20.1875,31.0156 21.5313,31.0156 Q22.1563,31.0156 22.75,30.75 Q23.3438,30.4688 23.9688,29.8906 L23.9688,32.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="24.1387">«concept»</text>
@@ -31,8 +31,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="109" y1="45.9375" y2="45.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="109" y1="53.9375" y2="53.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L13" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L13" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1843ug6opnv9)" height="53.9375" id="C_0001059590388833603455" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="145" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L13" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L13" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgoj9ly8t3nj9)" height="53.9375" id="C_0001059590388833603455" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="145" y="8"/>
       <ellipse cx="160" cy="26.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M162.9688,32.6094 Q162.3906,32.9063 161.75,33.0469 Q161.1094,33.2031 160.4063,33.2031 Q157.9063,33.2031 156.5781,31.5625 Q155.2656,29.9063 155.2656,26.7813 Q155.2656,23.6563 156.5781,22 Q157.9063,20.3438 160.4063,20.3438 Q161.1094,20.3438 161.75,20.5 Q162.4063,20.6563 162.9688,20.9531 L162.9688,23.6719 Q162.3438,23.0938 161.75,22.8281 Q161.1563,22.5469 160.5313,22.5469 Q159.1875,22.5469 158.5,23.625 Q157.8125,24.6875 157.8125,26.7813 Q157.8125,28.875 158.5,29.9531 Q159.1875,31.0156 160.5313,31.0156 Q161.1563,31.0156 161.75,30.75 Q162.3438,30.4688 162.9688,29.8906 L162.9688,32.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="172" y="24.1387">«concept»</text>
diff --git a/docs/test_cases/t00074_class_mermaid.svg b/docs/test_cases/t00074_class_mermaid.svg
index f747dfd1..008c3834 100644
--- a/docs/test_cases/t00074_class_mermaid.svg
+++ b/docs/test_cases/t00074_class_mermaid.svg
@@ -78,7 +78,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(138.9375, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L4">
+        <a transform="translate(138.9375, 194.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L4">
           <g title="fruit_c" id="classId-C_0000486119377394642787-0" class="node default clickable">
             <rect height="79" width="92.359375" y="-39.5" x="-46.1796875" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="46.1796875" x1="-46.1796875" class="divider"/>
@@ -97,7 +97,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(59.5234375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L10">
+        <a transform="translate(59.5234375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L10">
           <g title="apple_c" id="classId-C_0000560253541144761762-1" class="node default clickable">
             <rect height="79" width="103.046875" y="-39.5" x="-51.5234375" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="51.5234375" x1="-51.5234375" class="divider"/>
@@ -116,7 +116,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(218.3515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00074/t00074.cc#L13">
+        <a transform="translate(218.3515625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00074/t00074.cc#L13">
           <g title="orange_c" id="classId-C_0001059590388833603455-2" class="node default clickable">
             <rect height="79" width="114.609375" y="-39.5" x="-57.3046875" class="outer title-state"/>
             <line y2="12.5" y1="12.5" x2="57.3046875" x1="-57.3046875" class="divider"/>
diff --git a/docs/test_cases/t00075.md b/docs/test_cases/t00075.md
index 1c14d583..a5917295 100644
--- a/docs/test_cases/t00075.md
+++ b/docs/test_cases/t00075.md
@@ -74,7 +74,7 @@ struct R {
           "display_name": "ns2",
           "elements": [
             {
-              "display_name": "ns1::ns2::C<T>",
+              "display_name": "C<T>",
               "id": "1809332102026994985",
               "name": "C",
               "namespace": "clanguml::t00075::ns1::ns2",
@@ -101,7 +101,7 @@ struct R {
                 "k1",
                 "k2"
               ],
-              "display_name": "ns1::ns2::E",
+              "display_name": "E",
               "id": "1495076068471344273",
               "is_nested": false,
               "name": "E",
@@ -116,7 +116,7 @@ struct R {
             },
             {
               "bases": [],
-              "display_name": "ns1::ns2::A",
+              "display_name": "A",
               "id": "939187921829983364",
               "is_abstract": false,
               "is_nested": false,
@@ -127,6 +127,7 @@ struct R {
               "methods": [
                 {
                   "access": "public",
+                  "display_name": "e",
                   "is_const": true,
                   "is_consteval": false,
                   "is_constexpr": false,
@@ -149,6 +150,7 @@ struct R {
                     "line": 15,
                     "translation_unit": "t00075.cc"
                   },
+                  "template_parameters": [],
                   "type": "E"
                 }
               ],
@@ -165,7 +167,7 @@ struct R {
             },
             {
               "bases": [],
-              "display_name": "ns1::ns2::B",
+              "display_name": "B",
               "id": "707211578295440427",
               "is_abstract": false,
               "is_nested": false,
@@ -176,6 +178,7 @@ struct R {
               "methods": [
                 {
                   "access": "public",
+                  "display_name": "e",
                   "is_const": true,
                   "is_consteval": false,
                   "is_constexpr": false,
@@ -198,6 +201,7 @@ struct R {
                     "line": 20,
                     "translation_unit": "t00075.cc"
                   },
+                  "template_parameters": [],
                   "type": "E"
                 }
               ],
@@ -214,7 +218,7 @@ struct R {
             },
             {
               "bases": [],
-              "display_name": "ns1::ns2::ABE<ns1::ns2::C T>",
+              "display_name": "ABE<ns1::ns2::C T>",
               "id": "783353028058924890",
               "is_abstract": false,
               "is_nested": false,
@@ -256,7 +260,7 @@ struct R {
             },
             {
               "bases": [],
-              "display_name": "ns1::ns2::ABE<ns1::ns2::A>",
+              "display_name": "ABE<ns1::ns2::A>",
               "id": "1387241450840584649",
               "is_abstract": false,
               "is_nested": false,
@@ -278,14 +282,14 @@ struct R {
                   "is_variadic": false,
                   "kind": "argument",
                   "template_parameters": [],
-                  "type": "clanguml::t00075::ns1::ns2::A"
+                  "type": "ns1::ns2::A"
                 }
               ],
               "type": "class"
             },
             {
               "bases": [],
-              "display_name": "ns1::ns2::ABE<ns1::ns2::B>",
+              "display_name": "ABE<ns1::ns2::B>",
               "id": "1119831184809815406",
               "is_abstract": false,
               "is_nested": false,
@@ -307,14 +311,14 @@ struct R {
                   "is_variadic": false,
                   "kind": "argument",
                   "template_parameters": [],
-                  "type": "clanguml::t00075::ns1::ns2::B"
+                  "type": "ns1::ns2::B"
                 }
               ],
               "type": "class"
             },
             {
               "bases": [],
-              "display_name": "ns1::ns2::R",
+              "display_name": "R",
               "id": "48082947340048353",
               "is_abstract": false,
               "is_nested": false,
diff --git a/docs/test_cases/t00075_class.svg b/docs/test_cases/t00075_class.svg
index 11628a5a..18b25506 100644
--- a/docs/test_cases/t00075_class.svg
+++ b/docs/test_cases/t00075_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="670px" preserveAspectRatio="none" style="width:554px;height:670px;" version="1.1" viewBox="0 0 554 670" width="554px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13c9dowqhp4n9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f9brksamjyio3" 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>
-    <polygon fill="#808080" filter="url(#f13c9dowqhp4n9)" points="22,24,57,24,64,46.2969,532,46.2969,532,658,22,658,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#808080" filter="url(#f9brksamjyio3)" points="22,24,57,24,64,46.2969,532,46.2969,532,658,22,658,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">ns1</text>
-    <polygon fill="#808080" filter="url(#f13c9dowqhp4n9)" points="46,67,81,67,88,89.2969,508,89.2969,508,634,46,634,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#808080" filter="url(#f9brksamjyio3)" points="46,67,81,67,88,89.2969,508,89.2969,508,634,46,634,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="88" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="50" y="81.9951">ns2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#ADD8E6" filter="url(#f13c9dowqhp4n9)" height="92.3516" id="C_0001809332102026994985" style="stroke: #008000; stroke-width: 1.5;" width="104" x="225" y="253"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#ADD8E6" filter="url(#f9brksamjyio3)" height="92.3516" id="C_0001809332102026994985" style="stroke: #008000; stroke-width: 1.5;" width="104" x="225" y="253"/>
       <rect fill="#ADD8E6" height="37.9375" style="stroke: #008000; stroke-width: 1.5;" width="104" x="225" y="253"/>
       <ellipse cx="240" cy="271.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #008000; stroke-width: 1.0;"/>
       <path d="M242.9688,277.6094 Q242.3906,277.9063 241.75,278.0469 Q241.1094,278.2031 240.4063,278.2031 Q237.9063,278.2031 236.5781,276.5625 Q235.2656,274.9063 235.2656,271.7813 Q235.2656,268.6563 236.5781,267 Q237.9063,265.3438 240.4063,265.3438 Q241.1094,265.3438 241.75,265.5 Q242.4063,265.6563 242.9688,265.9531 L242.9688,268.6719 Q242.3438,268.0938 241.75,267.8281 Q241.1563,267.5469 240.5313,267.5469 Q239.1875,267.5469 238.5,268.625 Q237.8125,269.6875 237.8125,271.7813 Q237.8125,273.875 238.5,274.9531 Q239.1875,276.0156 240.5313,276.0156 Q241.1563,276.0156 241.75,275.75 Q242.3438,275.4688 242.9688,274.8906 L242.9688,277.6094 Z "/>
@@ -30,8 +30,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="231" y="325.9526">T{}</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="231" y="338.7573">t.e()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L12" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L12" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13c9dowqhp4n9)" height="73.6094" id="C_0001495076068471344273" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="40" x="257" y="544"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L12" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L12" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9brksamjyio3)" height="73.6094" id="C_0001495076068471344273" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="40" x="257" y="544"/>
       <ellipse cx="272" cy="560" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M276.1094,566 L268.3906,566 L268.3906,553.6094 L276.1094,553.6094 L276.1094,555.7656 L270.8438,555.7656 L270.8438,558.4375 L275.6094,558.4375 L275.6094,560.5938 L270.8438,560.5938 L270.8438,563.8438 L276.1094,563.8438 L276.1094,566 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="286" y="564.1543">E</text>
@@ -40,40 +40,40 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="13" x="263" y="603.0151">k2</text>
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="258" x2="296" y1="609.6094" y2="609.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#F0F8FF" filter="url(#f13c9dowqhp4n9)" height="60.8047" id="C_0000939187921829983364" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="95" x="77.5" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#F0F8FF" filter="url(#f9brksamjyio3)" height="60.8047" id="C_0000939187921829983364" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="95" x="77.5" y="422"/>
       <rect fill="#F0F8FF" height="32" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="95" x="77.5" y="422"/>
       <ellipse cx="117.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M120.2188,443.6406 Q119.6406,443.9375 119,444.0781 Q118.3594,444.2344 117.6563,444.2344 Q115.1563,444.2344 113.8281,442.5938 Q112.5156,440.9375 112.5156,437.8125 Q112.5156,434.6875 113.8281,433.0313 Q115.1563,431.375 117.6563,431.375 Q118.3594,431.375 119,431.5313 Q119.6563,431.6875 120.2188,431.9844 L120.2188,434.7031 Q119.5938,434.125 119,433.8594 Q118.4063,433.5781 117.7813,433.5781 Q116.4375,433.5781 115.75,434.6563 Q115.0625,435.7188 115.0625,437.8125 Q115.0625,439.9063 115.75,440.9844 Q116.4375,442.0469 117.7813,442.0469 Q118.4063,442.0469 119,441.7813 Q119.5938,441.5 120.2188,440.9219 L120.2188,443.6406 Z "/>
       <text fill="#0000FF" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="136.75" y="442.1543">A</text>
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="78.5" x2="171.5" y1="454" y2="454"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L15" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L15" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L15" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L15" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#F0F8FF" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="83.5" y="460"/>
       <ellipse cx="88.5" cy="465" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L15" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L15" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L15" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L15" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#0000FF" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="97.5" y="468.2104">e() const : E</text>
     </a>
     <line style="stroke: #0000FF; stroke-width: 1.5;" x1="78.5" x2="171.5" y1="474.8047" y2="474.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#F0F8FF" filter="url(#f13c9dowqhp4n9)" height="60.8047" id="C_0000707211578295440427" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="95" x="381.5" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#F0F8FF" filter="url(#f9brksamjyio3)" height="60.8047" id="C_0000707211578295440427" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="95" x="381.5" y="422"/>
       <rect fill="#F0F8FF" height="32" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="95" x="381.5" y="422"/>
       <ellipse cx="421.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M424.2188,443.6406 Q423.6406,443.9375 423,444.0781 Q422.3594,444.2344 421.6563,444.2344 Q419.1563,444.2344 417.8281,442.5938 Q416.5156,440.9375 416.5156,437.8125 Q416.5156,434.6875 417.8281,433.0313 Q419.1563,431.375 421.6563,431.375 Q422.3594,431.375 423,431.5313 Q423.6563,431.6875 424.2188,431.9844 L424.2188,434.7031 Q423.5938,434.125 423,433.8594 Q422.4063,433.5781 421.7813,433.5781 Q420.4375,433.5781 419.75,434.6563 Q419.0625,435.7188 419.0625,437.8125 Q419.0625,439.9063 419.75,440.9844 Q420.4375,442.0469 421.7813,442.0469 Q422.4063,442.0469 423,441.7813 Q423.5938,441.5 424.2188,440.9219 L424.2188,443.6406 Z "/>
       <text fill="#0000FF" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="440.75" y="442.1543">B</text>
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="382.5" x2="475.5" y1="454" y2="454"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L20" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L20" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L20" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L20" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#F0F8FF" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="387.5" y="460"/>
       <ellipse cx="392.5" cy="465" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L20" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L20" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L20" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L20" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#0000FF" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="401.5" y="468.2104">e() const : E</text>
     </a>
     <line style="stroke: #0000FF; stroke-width: 1.5;" x1="382.5" x2="475.5" y1="474.8047" y2="474.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23" target="_top" title="ABE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23" xlink:show="new" xlink:title="ABE" xlink:type="simple">
-      <rect fill="#F0F8FF" filter="url(#f13c9dowqhp4n9)" height="60.8047" id="C_0000783353028058924890" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="139" x="207.5" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23" target="_top" title="ABE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23" xlink:show="new" xlink:title="ABE" xlink:type="simple">
+      <rect fill="#F0F8FF" filter="url(#f9brksamjyio3)" height="60.8047" id="C_0000783353028058924890" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="139" x="207.5" y="422"/>
       <rect fill="#F0F8FF" height="32" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="139" x="207.5" y="422"/>
       <ellipse cx="222.5" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M225.4688,443.6406 Q224.8906,443.9375 224.25,444.0781 Q223.6094,444.2344 222.9063,444.2344 Q220.4063,444.2344 219.0781,442.5938 Q217.7656,440.9375 217.7656,437.8125 Q217.7656,434.6875 219.0781,433.0313 Q220.4063,431.375 222.9063,431.375 Q223.6094,431.375 224.25,431.5313 Q224.9063,431.6875 225.4688,431.9844 L225.4688,434.7031 Q224.8438,434.125 224.25,433.8594 Q223.6563,433.5781 223.0313,433.5781 Q221.6875,433.5781 221,434.6563 Q220.3125,435.7188 220.3125,437.8125 Q220.3125,439.9063 221,440.9844 Q221.6875,442.0469 223.0313,442.0469 Q223.6563,442.0469 224.25,441.7813 Q224.8438,441.5 225.4688,440.9219 L225.4688,443.6406 Z "/>
@@ -83,15 +83,15 @@
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="208.5" x2="345.5" y1="454" y2="454"/>
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="208.5" x2="345.5" y1="462" y2="462"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L24" target="_top" title="a_or_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L24" xlink:show="new" xlink:title="a_or_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L24" target="_top" title="a_or_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L24" xlink:show="new" xlink:title="a_or_b" xlink:type="simple">
       <rect fill="#F0F8FF" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="213.5" y="468"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="215.5" y="470"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L24" target="_top" title="a_or_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L24" xlink:show="new" xlink:title="a_or_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L24" target="_top" title="a_or_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L24" xlink:show="new" xlink:title="a_or_b" xlink:type="simple">
       <text fill="#0000FF" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="227.5" y="476.2104">a_or_b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23" target="_top" title="ABE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23" xlink:show="new" xlink:title="ABE" xlink:type="simple">
-      <rect fill="#F0F8FF" filter="url(#f13c9dowqhp4n9)" height="48" id="C_0001387241450840584649" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="128" x="62" y="275"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23" target="_top" title="ABE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23" xlink:show="new" xlink:title="ABE" xlink:type="simple">
+      <rect fill="#F0F8FF" filter="url(#f9brksamjyio3)" height="48" id="C_0001387241450840584649" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="128" x="62" y="275"/>
       <rect fill="#F0F8FF" height="32" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="128" x="62" y="275"/>
       <ellipse cx="77" cy="291" fill="#ADD1B2" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M79.9688,296.6406 Q79.3906,296.9375 78.75,297.0781 Q78.1094,297.2344 77.4063,297.2344 Q74.9063,297.2344 73.5781,295.5938 Q72.2656,293.9375 72.2656,290.8125 Q72.2656,287.6875 73.5781,286.0313 Q74.9063,284.375 77.4063,284.375 Q78.1094,284.375 78.75,284.5313 Q79.4063,284.6875 79.9688,284.9844 L79.9688,287.7031 Q79.3438,287.125 78.75,286.8594 Q78.1563,286.5781 77.5313,286.5781 Q76.1875,286.5781 75.5,287.6563 Q74.8125,288.7188 74.8125,290.8125 Q74.8125,292.9063 75.5,293.9844 Q76.1875,295.0469 77.5313,295.0469 Q78.1563,295.0469 78.75,294.7813 Q79.3438,294.5 79.9688,293.9219 L79.9688,296.6406 Z "/>
@@ -101,8 +101,8 @@
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="63" x2="189" y1="307" y2="307"/>
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="63" x2="189" y1="315" y2="315"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23" target="_top" title="ABE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23" xlink:show="new" xlink:title="ABE" xlink:type="simple">
-      <rect fill="#F0F8FF" filter="url(#f13c9dowqhp4n9)" height="48" id="C_0001119831184809815406" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="128" x="364" y="275"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23" target="_top" title="ABE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23" xlink:show="new" xlink:title="ABE" xlink:type="simple">
+      <rect fill="#F0F8FF" filter="url(#f9brksamjyio3)" height="48" id="C_0001119831184809815406" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="128" x="364" y="275"/>
       <rect fill="#F0F8FF" height="32" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="128" x="364" y="275"/>
       <ellipse cx="379" cy="291" fill="#ADD1B2" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M381.9688,296.6406 Q381.3906,296.9375 380.75,297.0781 Q380.1094,297.2344 379.4063,297.2344 Q376.9063,297.2344 375.5781,295.5938 Q374.2656,293.9375 374.2656,290.8125 Q374.2656,287.6875 375.5781,286.0313 Q376.9063,284.375 379.4063,284.375 Q380.1094,284.375 380.75,284.5313 Q381.4063,284.6875 381.9688,284.9844 L381.9688,287.7031 Q381.3438,287.125 380.75,286.8594 Q380.1563,286.5781 379.5313,286.5781 Q378.1875,286.5781 377.5,287.6563 Q376.8125,288.7188 376.8125,290.8125 Q376.8125,292.9063 377.5,293.9844 Q378.1875,295.0469 379.5313,295.0469 Q380.1563,295.0469 380.75,294.7813 Q381.3438,294.5 381.9688,293.9219 L381.9688,296.6406 Z "/>
@@ -112,8 +112,8 @@
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="365" x2="491" y1="307" y2="307"/>
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="365" x2="491" y1="315" y2="315"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#F0F8FF" filter="url(#f13c9dowqhp4n9)" height="73.6094" id="C_0000048082947340048353" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="93" x="169.5" y="102"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#F0F8FF" filter="url(#f9brksamjyio3)" height="73.6094" id="C_0000048082947340048353" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="93" x="169.5" y="102"/>
       <rect fill="#F0F8FF" height="32" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="93" x="169.5" y="102"/>
       <ellipse cx="208.35" cy="118" fill="#ADD1B2" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M211.3188,123.6406 Q210.7406,123.9375 210.1,124.0781 Q209.4594,124.2344 208.7563,124.2344 Q206.2563,124.2344 204.9281,122.5938 Q203.6156,120.9375 203.6156,117.8125 Q203.6156,114.6875 204.9281,113.0313 Q206.2563,111.375 208.7563,111.375 Q209.4594,111.375 210.1,111.5313 Q210.7563,111.6875 211.3188,111.9844 L211.3188,114.7031 Q210.6938,114.125 210.1,113.8594 Q209.5063,113.5781 208.8813,113.5781 Q207.5375,113.5781 206.85,114.6563 Q206.1625,115.7188 206.1625,117.8125 Q206.1625,119.9063 206.85,120.9844 Q207.5375,122.0469 208.8813,122.0469 Q209.5063,122.0469 210.1,121.7813 Q210.6938,121.5 211.3188,120.9219 L211.3188,123.6406 Z "/>
@@ -121,18 +121,18 @@
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="170.5" x2="261.5" y1="134" y2="134"/>
       <line style="stroke: #0000FF; stroke-width: 1.5;" x1="170.5" x2="261.5" y1="142" y2="142"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#F0F8FF" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="175.5" y="148"/>
       <ellipse cx="180.5" cy="153" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#0000FF" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="189.5" y="156.2104">a : ABE&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L29" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L29" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L29" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L29" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#F0F8FF" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="175.5" y="160.8047"/>
       <ellipse cx="180.5" cy="165.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L29" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L29" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L29" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L29" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#0000FF" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="67" x="189.5" y="169.0151">b : ABE&lt;B&gt;</text>
     </a>
     <path d="M160.64,483.16 C189.12,506.87 228.27,539.44 253.1,560.11 " fill="none" id="C_0000939187921829983364-&gt;C_0001495076068471344273" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00075_class_mermaid.svg b/docs/test_cases/t00075_class_mermaid.svg
index fbe488ac..4b89a13d 100644
--- a/docs/test_cases/t00075_class_mermaid.svg
+++ b/docs/test_cases/t00075_class_mermaid.svg
@@ -162,11 +162,11 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(560.83203125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L7">
+        <a transform="translate(560.83203125, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L7">
           <g title="C" id="classId-C_0001809332102026994985-0" class="node default clickable">
             <rect height="145" width="131.46875" y="-72.5" x="-65.734375" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="65.734375" x1="-65.734375" class="divider"/>
-            <line y2="39.5" y1="39.5" x2="65.734375" x1="-65.734375" class="divider"/>
+            <line y2="17.5" y1="17.5" x2="65.734375" x1="-65.734375" class="divider"/>
             <g class="label">
               <foreignObject transform="translate( -36.921875, -65)" height="18" width="73.84375">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -183,20 +183,20 @@
                   <span class="nodeLabel">"T{}"</span>
                 </div>
               </foreignObject>
-              <foreignObject transform="translate( -58.234375, 13)" height="18" width="39.8125">
-                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                  <span class="nodeLabel">"t.e()"</span>
-                </div>
-              </foreignObject>
-              <foreignObject transform="translate( -58.234375, 47)" height="18" width="40.390625">
+              <foreignObject transform="translate( -58.234375, 25)" height="18" width="40.390625">
                 <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                   <span class="nodeLabel">"(T t)"</span>
                 </div>
               </foreignObject>
+              <foreignObject transform="translate( -58.234375, 47)" height="18" width="34.125">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">"t.e()</span>
+                </div>
+              </foreignObject>
             </g>
           </g>
         </a>
-        <a transform="translate(152.484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L12">
+        <a transform="translate(152.484375, 503.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L12">
           <g title="E" id="classId-C_0001495076068471344273-1" class="node default clickable">
             <rect height="123" width="121.75" y="-61.5" x="-60.875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -225,7 +225,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(67.7421875, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L14">
+        <a transform="translate(67.7421875, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L14">
           <g title="A" id="classId-C_0000939187921829983364-2" class="node default clickable">
             <rect height="79" width="119.484375" y="-39.5" x="-59.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="59.7421875" x1="-59.7421875" class="divider"/>
@@ -249,7 +249,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(293.453125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L18">
+        <a transform="translate(293.453125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L18">
           <g title="B" id="classId-C_0000707211578295440427-3" class="node default clickable">
             <rect height="79" width="119.484375" y="-39.5" x="-59.7421875" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="59.7421875" x1="-59.7421875" class="divider"/>
@@ -273,7 +273,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(560.83203125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23">
+        <a transform="translate(560.83203125, 323.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23">
           <g title="ABE" id="classId-C_0000783353028058924890-4" class="node default clickable">
             <rect height="79" width="246.15625" y="-39.5" x="-123.078125" class="outer title-state"/>
             <line y2="-9.5" y1="-9.5" x2="123.078125" x1="-123.078125" class="divider"/>
@@ -297,7 +297,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(162.484375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23">
+        <a transform="translate(162.484375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23">
           <g title="ABE" id="classId-C_0001387241450840584649-5" class="node default clickable">
             <rect height="57" width="231.9375" y="-28.5" x="-115.96875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="115.96875" x1="-115.96875" class="divider"/>
@@ -316,7 +316,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(444.421875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L23">
+        <a transform="translate(444.421875, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L23">
           <g title="ABE" id="classId-C_0001119831184809815406-6" class="node default clickable">
             <rect height="57" width="231.9375" y="-28.5" x="-115.96875" class="outer title-state"/>
             <line y2="1.5" y1="1.5" x2="115.96875" x1="-115.96875" class="divider"/>
@@ -335,7 +335,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(303.453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t00075/t00075.cc#L27">
+        <a transform="translate(303.453125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t00075/t00075.cc#L27">
           <g title="R" id="classId-C_0000048082947340048353-7" class="node default clickable">
             <rect height="101" width="107.078125" y="-50.5" x="-53.5390625" class="outer title-state"/>
             <line y2="-20.5" y1="-20.5" x2="53.5390625" x1="-53.5390625" class="divider"/>
diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md
index ad8edfae..c2fd7462 100644
--- a/docs/test_cases/t20001.md
+++ b/docs/test_cases/t20001.md
@@ -120,6 +120,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20001::tmain()",
       "id": "622672604730036140",
       "name": "tmain",
       "namespace": "clanguml::t20001",
@@ -135,6 +136,7 @@ int tmain()
       "activities": [
         {
           "display_name": "A()",
+          "full_name": "clanguml::t20001::A::A()",
           "id": "275353461034438145",
           "name": "A",
           "namespace": "",
@@ -148,6 +150,7 @@ int tmain()
         },
         {
           "display_name": "add(int,int)",
+          "full_name": "clanguml::t20001::A::add(int,int)",
           "id": "1131549932713395402",
           "name": "add",
           "namespace": "",
@@ -161,6 +164,7 @@ int tmain()
         },
         {
           "display_name": "add3(int,int,int)",
+          "full_name": "clanguml::t20001::A::add3(int,int,int)",
           "id": "2090436635449419593",
           "name": "add3",
           "namespace": "",
@@ -174,6 +178,7 @@ int tmain()
         },
         {
           "display_name": "log_result(int)",
+          "full_name": "clanguml::t20001::A::log_result(int)",
           "id": "1205947631808952097",
           "name": "log_result",
           "namespace": "",
@@ -187,6 +192,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20001::A",
       "id": "1771943546649183134",
       "name": "A",
       "namespace": "clanguml::t20001",
@@ -202,6 +208,7 @@ int tmain()
       "activities": [
         {
           "display_name": "B(A &)",
+          "full_name": "clanguml::t20001::B::B(A &)",
           "id": "2235477658795500000",
           "name": "B",
           "namespace": "",
@@ -215,6 +222,7 @@ int tmain()
         },
         {
           "display_name": "wrap_add3(int,int,int)",
+          "full_name": "clanguml::t20001::B::wrap_add3(int,int,int)",
           "id": "642550151323208936",
           "name": "wrap_add3",
           "namespace": "",
@@ -228,6 +236,7 @@ int tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20001::B",
       "id": "272433898507800600",
       "name": "B",
       "namespace": "clanguml::t20001",
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index f102863b..3328d47a 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="699px" preserveAspectRatio="none" style="width:341px;height:699px;" version="1.1" viewBox="0 0 341 699" width="341px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1s9ipme0etupq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1k8rrpl7237rg" 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"/>
@@ -10,79 +10,79 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="293" x="24.5" y="26.708">Basic sequence diagram example</text>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="94" x2="94" y1="73.25" y2="658.7109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="73.25" y2="658.7109"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="320" x2="320" y1="73.25" y2="658.7109"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1s9ipme0etupq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="37.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k8rrpl7237rg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="37.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="57.9482">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1s9ipme0etupq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="657.7109"/>
+      <rect fill="#FEFECE" filter="url(#f1k8rrpl7237rg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="61" y="657.7109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="68" y="677.7061">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1s9ipme0etupq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="37.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k8rrpl7237rg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="37.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="57.9482">A</text>
-      <rect fill="#FEFECE" filter="url(#f1s9ipme0etupq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="657.7109"/>
+      <rect fill="#FEFECE" filter="url(#f1k8rrpl7237rg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="179.5" y="657.7109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="677.7061">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1s9ipme0etupq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="37.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k8rrpl7237rg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="37.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="57.9482">B</text>
-      <rect fill="#FEFECE" filter="url(#f1s9ipme0etupq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="657.7109"/>
+      <rect fill="#FEFECE" filter="url(#f1k8rrpl7237rg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="306" y="657.7109"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="313" y="677.7061">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1s9ipme0etupq)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="518.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="89" y="83.25"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="104.3828"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="261.7813"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="373.1797"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="410.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188" y="557.5781"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="163.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f1k8rrpl7237rg)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="315" y="344.0469"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176,100.3828,186,104.3828,176,108.3828,180,104.3828" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="104.3828" y2="104.3828"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="106" y="99.3169">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="303,159.5156,313,163.5156,303,167.5156,307,163.5156" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="163.5156" y2="163.5156"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="43" x="106" y="158.4497">B(A &amp;)</text>
     </a>
-    <path d="M19,206.5156 L19,231.5156 L164,231.5156 L164,216.5156 L154,206.5156 L19,206.5156 " fill="#FBFB77" filter="url(#f1s9ipme0etupq)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M19,206.5156 L19,231.5156 L164,231.5156 L164,216.5156 L154,206.5156 L19,206.5156 " fill="#FBFB77" filter="url(#f1k8rrpl7237rg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M154,206.5156 L154,216.5156 L164,216.5156 L154,206.5156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="124" x="25" y="223.5825">Just add 2 numbers</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176,257.7813,186,261.7813,176,265.7813,180,261.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="182" y1="261.7813" y2="261.7813"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="106" y="256.7153">add(int,int)</text>
     </a>
     <polygon fill="#A80036" points="110,271.7813,100,275.7813,110,279.7813,106,275.7813" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="104" x2="192" y1="275.7813" y2="275.7813"/>
-    <path d="M8,288.7813 L8,313.7813 L177,313.7813 L177,298.7813 L167,288.7813 L8,288.7813 " fill="#FBFB77" filter="url(#f1s9ipme0etupq)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M8,288.7813 L8,313.7813 L177,313.7813 L177,298.7813 L167,288.7813 L8,288.7813 " fill="#FBFB77" filter="url(#f1k8rrpl7237rg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M167,288.7813 L167,298.7813 L177,298.7813 L167,288.7813 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="148" x="14" y="305.8481">And now add another 2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="303,340.0469,313,344.0469,303,348.0469,307,344.0469" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="99" x2="309" y1="344.0469" y2="344.0469"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="106" y="338.981">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209,369.1797,199,373.1797,209,377.1797,205,373.1797" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="373.1797" y2="373.1797"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="215" y="368.1138">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="198" x2="245" y1="397.3125" y2="397.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="397.3125" y2="410.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="410.3125" y2="410.3125"/>
@@ -93,7 +93,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="245" x2="245" y1="434.3125" y2="447.3125"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="198" x2="245" y1="447.3125" y2="447.3125"/>
     <polygon fill="#A80036" points="208,443.3125,198,447.3125,208,451.3125,204,447.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="245" y1="471.4453" y2="471.4453"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="245" y1="471.4453" y2="484.4453"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204" x2="245" y1="484.4453" y2="484.4453"/>
@@ -102,14 +102,14 @@
     </a>
     <polygon fill="#A80036" points="303,524.4453,313,528.4453,303,532.4453,307,528.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193" x2="309" y1="528.4453" y2="528.4453"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209,553.5781,199,557.5781,209,561.5781,205,557.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203" x2="314" y1="557.5781" y2="557.5781"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="215" y="552.5122">log_result(int)</text>
     </a>
     <polygon fill="#A80036" points="105,597.5781,95,601.5781,105,605.5781,101,601.5781" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="99" x2="319" y1="601.5781" y2="601.5781"/>
-    <path d="M24,614.5781 L24,639.5781 L159,639.5781 L159,624.5781 L149,614.5781 L24,614.5781 " fill="#FBFB77" filter="url(#f1s9ipme0etupq)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M24,614.5781 L24,639.5781 L159,639.5781 L159,624.5781 L149,614.5781 L24,614.5781 " fill="#FBFB77" filter="url(#f1k8rrpl7237rg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M149,614.5781 L149,624.5781 L159,624.5781 L149,614.5781 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="30" y="631.645">Main test function</text>
   </g>
diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md
index 1c2908c0..481514d5 100644
--- a/docs/test_cases/t20002.md
+++ b/docs/test_cases/t20002.md
@@ -47,6 +47,7 @@ void m1() { m2(); }
   "participants": [
     {
       "display_name": "m1()",
+      "full_name": "clanguml::t20002::m1()",
       "id": "1619421429271064154",
       "name": "m1",
       "namespace": "clanguml::t20002",
@@ -60,6 +61,7 @@ void m1() { m2(); }
     },
     {
       "display_name": "m2()",
+      "full_name": "clanguml::t20002::m2()",
       "id": "1575240232156112674",
       "name": "m2",
       "namespace": "clanguml::t20002",
@@ -73,6 +75,7 @@ void m1() { m2(); }
     },
     {
       "display_name": "m3()",
+      "full_name": "clanguml::t20002::m3()",
       "id": "1838809176089209580",
       "name": "m3",
       "namespace": "clanguml::t20002",
@@ -86,6 +89,7 @@ void m1() { m2(); }
     },
     {
       "display_name": "m4()",
+      "full_name": "clanguml::t20002::m4()",
       "id": "63715062711218534",
       "name": "m4",
       "namespace": "clanguml::t20002",
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 05f44ae3..af825fa9 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="f4pwmgrcyfslr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbckuhs5dry5n" 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(#f4pwmgrcyfslr)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4pwmgrcyfslr)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4pwmgrcyfslr)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4pwmgrcyfslr)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4pwmgrcyfslr)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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(#f4pwmgrcyfslr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4pwmgrcyfslr)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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(#f4pwmgrcyfslr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4pwmgrcyfslr)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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(#f4pwmgrcyfslr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4pwmgrcyfslr)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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(#f4pwmgrcyfslr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fbckuhs5dry5n)" 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(#f4pwmgrcyfslr)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4pwmgrcyfslr)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4pwmgrcyfslr)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4pwmgrcyfslr)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbckuhs5dry5n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 a8383069..50382330 100644
--- a/docs/test_cases/t20003.md
+++ b/docs/test_cases/t20003.md
@@ -43,6 +43,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
   "participants": [
     {
       "display_name": "m1<T>(T)",
+      "full_name": "clanguml::t20003::m1<T>(T)",
       "id": "469205740799240869",
       "name": "m1",
       "namespace": "clanguml::t20003",
@@ -56,6 +57,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
     },
     {
       "display_name": "m2<T>(T)",
+      "full_name": "clanguml::t20003::m2<T>(T)",
       "id": "1502957449367040488",
       "name": "m2",
       "namespace": "clanguml::t20003",
@@ -69,6 +71,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
     },
     {
       "display_name": "m3<T>(T)",
+      "full_name": "clanguml::t20003::m3<T>(T)",
       "id": "613477682313507585",
       "name": "m3",
       "namespace": "clanguml::t20003",
@@ -82,6 +85,7 @@ template <typename T> void m1(T p) { m2<T>(p); }
     },
     {
       "display_name": "m4<T>(T)",
+      "full_name": "clanguml::t20003::m4<T>(T)",
       "id": "619960023608507925",
       "name": "m4",
       "namespace": "clanguml::t20003",
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index d82d7710..453055fc 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="f1bz8pbr9wq8ty" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f24xqscfqehl8" 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(#f1bz8pbr9wq8ty)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bz8pbr9wq8ty)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bz8pbr9wq8ty)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bz8pbr9wq8ty)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bz8pbr9wq8ty)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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(#f1bz8pbr9wq8ty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bz8pbr9wq8ty)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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(#f1bz8pbr9wq8ty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bz8pbr9wq8ty)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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(#f1bz8pbr9wq8ty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bz8pbr9wq8ty)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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(#f1bz8pbr9wq8ty)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f24xqscfqehl8)" 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(#f1bz8pbr9wq8ty)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bz8pbr9wq8ty)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bz8pbr9wq8ty)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bz8pbr9wq8ty)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f24xqscfqehl8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 a8c5edd5..c9e2c49f 100644
--- a/docs/test_cases/t20004.md
+++ b/docs/test_cases/t20004.md
@@ -79,6 +79,7 @@ int main()
   "participants": [
     {
       "display_name": "main()",
+      "full_name": "clanguml::t20004::main()",
       "id": "2299662004367884401",
       "name": "main",
       "namespace": "clanguml::t20004",
@@ -92,6 +93,7 @@ int main()
     },
     {
       "display_name": "m1<float>(float)",
+      "full_name": "clanguml::t20004::m1<float>(float)",
       "id": "138925040763435897",
       "name": "m1",
       "namespace": "clanguml::t20004",
@@ -105,6 +107,7 @@ int main()
     },
     {
       "display_name": "m1<unsigned long>(unsigned long)",
+      "full_name": "clanguml::t20004::m1<unsigned long>(unsigned long)",
       "id": "1239083518717603720",
       "name": "m1",
       "namespace": "clanguml::t20004",
@@ -118,6 +121,7 @@ int main()
     },
     {
       "display_name": "m4<unsigned long>(unsigned long)",
+      "full_name": "clanguml::t20004::m4<unsigned long>(unsigned long)",
       "id": "376599675205498367",
       "name": "m4",
       "namespace": "clanguml::t20004",
@@ -131,6 +135,7 @@ int main()
     },
     {
       "display_name": "m1<std::string>(std::string)",
+      "full_name": "clanguml::t20004::m1<std::string>(std::string)",
       "id": "1845817984839618223",
       "name": "m1",
       "namespace": "clanguml::t20004",
@@ -144,6 +149,7 @@ int main()
     },
     {
       "display_name": "m2<std::string>(std::string)",
+      "full_name": "clanguml::t20004::m2<std::string>(std::string)",
       "id": "1735054254122948614",
       "name": "m2",
       "namespace": "clanguml::t20004",
@@ -157,6 +163,7 @@ int main()
     },
     {
       "display_name": "m1<int>(int)",
+      "full_name": "clanguml::t20004::m1<int>(int)",
       "id": "121663532044911922",
       "name": "m1",
       "namespace": "clanguml::t20004",
@@ -170,6 +177,7 @@ int main()
     },
     {
       "display_name": "m2<int>(int)",
+      "full_name": "clanguml::t20004::m2<int>(int)",
       "id": "1475362124497386656",
       "name": "m2",
       "namespace": "clanguml::t20004",
@@ -183,6 +191,7 @@ int main()
     },
     {
       "display_name": "m3<int>(int)",
+      "full_name": "clanguml::t20004::m3<int>(int)",
       "id": "734999226157549914",
       "name": "m3",
       "namespace": "clanguml::t20004",
@@ -196,6 +205,7 @@ int main()
     },
     {
       "display_name": "m4<int>(int)",
+      "full_name": "clanguml::t20004::m4<int>(int)",
       "id": "1006390865908497562",
       "name": "m4",
       "namespace": "clanguml::t20004",
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index a510e441..576db1e0 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="fj9v1mf61kev8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ki3e365iaybu" 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(#fj9v1mf61kev8)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fj9v1mf61kev8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1ki3e365iaybu)" 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(#fj9v1mf61kev8)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fj9v1mf61kev8)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ki3e365iaybu)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 daa14c5a..36feee57 100644
--- a/docs/test_cases/t20005.md
+++ b/docs/test_cases/t20005.md
@@ -52,6 +52,7 @@ template <typename T> struct C {
       "activities": [
         {
           "display_name": "c(T)",
+          "full_name": "clanguml::t20005::C<T>::c(T)",
           "id": "578718872965404973",
           "name": "c",
           "namespace": "",
@@ -65,6 +66,7 @@ template <typename T> struct C {
         }
       ],
       "display_name": "C<T>",
+      "full_name": "clanguml::t20005::C<T>",
       "id": "365569130532127604",
       "name": "C",
       "namespace": "clanguml::t20005",
@@ -80,6 +82,7 @@ template <typename T> struct C {
       "activities": [
         {
           "display_name": "b(T)",
+          "full_name": "clanguml::t20005::B<T>::b(T)",
           "id": "870466496899932117",
           "name": "b",
           "namespace": "",
@@ -93,6 +96,7 @@ template <typename T> struct C {
         }
       ],
       "display_name": "B<T>",
+      "full_name": "clanguml::t20005::B<T>",
       "id": "666000829532846850",
       "name": "B",
       "namespace": "clanguml::t20005",
@@ -108,6 +112,7 @@ template <typename T> struct C {
       "activities": [
         {
           "display_name": "a(T)",
+          "full_name": "clanguml::t20005::A<T>::a(T)",
           "id": "124853455814403745",
           "name": "a",
           "namespace": "",
@@ -121,6 +126,7 @@ template <typename T> struct C {
         }
       ],
       "display_name": "A<T>",
+      "full_name": "clanguml::t20005::A<T>",
       "id": "1278330455625941185",
       "name": "A",
       "namespace": "clanguml::t20005",
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index 464aca3f..129fe281 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="fzrfnrlby4c0t" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f6t9du5zfgmp1" 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(#fzrfnrlby4c0t)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fzrfnrlby4c0t)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fzrfnrlby4c0t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6t9du5zfgmp1)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6t9du5zfgmp1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6t9du5zfgmp1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzrfnrlby4c0t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6t9du5zfgmp1)" 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(#fzrfnrlby4c0t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f6t9du5zfgmp1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzrfnrlby4c0t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6t9du5zfgmp1)" 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(#fzrfnrlby4c0t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f6t9du5zfgmp1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzrfnrlby4c0t)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6t9du5zfgmp1)" 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(#fzrfnrlby4c0t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f6t9du5zfgmp1)" 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(#fzrfnrlby4c0t)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fzrfnrlby4c0t)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fzrfnrlby4c0t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6t9du5zfgmp1)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6t9du5zfgmp1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6t9du5zfgmp1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 afb11868..59c28d0b 100644
--- a/docs/test_cases/t20006.md
+++ b/docs/test_cases/t20006.md
@@ -108,6 +108,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20006::tmain()",
       "id": "363965584448680958",
       "name": "tmain",
       "namespace": "clanguml::t20006",
@@ -123,6 +124,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(int)",
+          "full_name": "clanguml::t20006::B<int>::b(int)",
           "id": "250247217888843587",
           "name": "b",
           "namespace": "",
@@ -136,6 +138,7 @@ void tmain()
         }
       ],
       "display_name": "B<int>",
+      "full_name": "clanguml::t20006::B<int>",
       "id": "2197760498261923035",
       "name": "B",
       "namespace": "clanguml::t20006",
@@ -151,6 +154,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a1(int)",
+          "full_name": "clanguml::t20006::A<int>::a1(int)",
           "id": "196390487987395669",
           "name": "a1",
           "namespace": "",
@@ -164,6 +168,7 @@ void tmain()
         }
       ],
       "display_name": "A<int>",
+      "full_name": "clanguml::t20006::A<int>",
       "id": "596484796124829039",
       "name": "A",
       "namespace": "clanguml::t20006",
@@ -179,6 +184,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(std::string)",
+          "full_name": "clanguml::t20006::B<std::string>::b(std::string)",
           "id": "13049632552871157",
           "name": "b",
           "namespace": "",
@@ -192,6 +198,7 @@ void tmain()
         }
       ],
       "display_name": "B<std::string>",
+      "full_name": "clanguml::t20006::B<std::string>",
       "id": "2102622661983365981",
       "name": "B",
       "namespace": "clanguml::t20006",
@@ -207,6 +214,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a2(std::string)",
+          "full_name": "clanguml::t20006::A<std::string>::a2(std::string)",
           "id": "11762588624112907",
           "name": "a2",
           "namespace": "",
@@ -220,6 +228,7 @@ void tmain()
         }
       ],
       "display_name": "A<std::string>",
+      "full_name": "clanguml::t20006::A<std::string>",
       "id": "413459875415381273",
       "name": "A",
       "namespace": "clanguml::t20006",
@@ -235,6 +244,7 @@ void tmain()
       "activities": [
         {
           "display_name": "BB(AA<int> *)",
+          "full_name": "clanguml::t20006::BB<int,std::string>::BB(AA<int> *)",
           "id": "381732876807761480",
           "name": "BB",
           "namespace": "",
@@ -248,6 +258,7 @@ void tmain()
         },
         {
           "display_name": "bb1(int,std::string)",
+          "full_name": "clanguml::t20006::BB<int,std::string>::bb1(int,std::string)",
           "id": "1062874005712014125",
           "name": "bb1",
           "namespace": "",
@@ -261,6 +272,7 @@ void tmain()
         },
         {
           "display_name": "bb2(int,std::string)",
+          "full_name": "clanguml::t20006::BB<int,std::string>::bb2(int,std::string)",
           "id": "787705189994778234",
           "name": "bb2",
           "namespace": "",
@@ -274,6 +286,7 @@ void tmain()
         }
       ],
       "display_name": "BB<int,std::string>",
+      "full_name": "clanguml::t20006::BB<int,std::string>",
       "id": "2269742833301555472",
       "name": "BB",
       "namespace": "clanguml::t20006",
@@ -289,6 +302,7 @@ void tmain()
       "activities": [
         {
           "display_name": "BB(AA<int> &)",
+          "full_name": "clanguml::t20006::BB<int,float>::BB(AA<int> &)",
           "id": "1051013203072323842",
           "name": "BB",
           "namespace": "",
@@ -302,6 +316,7 @@ void tmain()
         },
         {
           "display_name": "bb1(int,float)",
+          "full_name": "clanguml::t20006::BB<int,float>::bb1(int,float)",
           "id": "1463188845572485713",
           "name": "bb1",
           "namespace": "",
@@ -315,6 +330,7 @@ void tmain()
         },
         {
           "display_name": "bb2(int,float)",
+          "full_name": "clanguml::t20006::BB<int,float>::bb2(int,float)",
           "id": "732362671329401903",
           "name": "bb2",
           "namespace": "",
@@ -328,6 +344,7 @@ void tmain()
         }
       ],
       "display_name": "BB<int,float>",
+      "full_name": "clanguml::t20006::BB<int,float>",
       "id": "1743503037360505162",
       "name": "BB",
       "namespace": "clanguml::t20006",
@@ -343,6 +360,7 @@ void tmain()
       "activities": [
         {
           "display_name": "bb1(int,int)",
+          "full_name": "clanguml::t20006::BB<int,int>::bb1(int,int)",
           "id": "1213865121829347654",
           "name": "bb1",
           "namespace": "",
@@ -356,6 +374,7 @@ void tmain()
         },
         {
           "display_name": "bb2(int,int)",
+          "full_name": "clanguml::t20006::BB<int,int>::bb2(int,int)",
           "id": "361650123916792854",
           "name": "bb2",
           "namespace": "",
@@ -369,6 +388,7 @@ void tmain()
         }
       ],
       "display_name": "BB<int,int>",
+      "full_name": "clanguml::t20006::BB<int,int>",
       "id": "264392653889863384",
       "name": "BB",
       "namespace": "clanguml::t20006",
@@ -384,6 +404,7 @@ void tmain()
       "activities": [
         {
           "display_name": "aa1(int)",
+          "full_name": "clanguml::t20006::AA<int>::aa1(int)",
           "id": "1235428163990670191",
           "name": "aa1",
           "namespace": "",
@@ -397,6 +418,7 @@ void tmain()
         },
         {
           "display_name": "aa2(int)",
+          "full_name": "clanguml::t20006::AA<int>::aa2(int)",
           "id": "582097827335267290",
           "name": "aa2",
           "namespace": "",
@@ -410,6 +432,7 @@ void tmain()
         }
       ],
       "display_name": "AA<int>",
+      "full_name": "clanguml::t20006::AA<int>",
       "id": "1903567228894636312",
       "name": "AA",
       "namespace": "clanguml::t20006",
@@ -491,7 +514,7 @@ void tmain()
             "participant_id": "2102622661983365981"
           },
           "name": "a2(std::string)",
-          "return_type": "std::basic_string<char>",
+          "return_type": "std::string",
           "scope": "normal",
           "source_location": {
             "column": 45,
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index 0acd1a86..cddbc271 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="872px" preserveAspectRatio="none" style="width:986px;height:872px;" version="1.1" viewBox="0 0 986 872" width="986px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1o0orv4y9u0kj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f8tgth0t8n7mt" 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>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="832.5547"/>
@@ -36,84 +36,84 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="842" x2="842" y1="38.2969" y2="832.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="940" x2="940" y1="38.2969" y2="832.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" 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(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="851.5498">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" 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(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="851.5498">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" 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(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="851.5498">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" 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(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="851.5498">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" 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(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="851.5498">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="22.9951">BB&lt;int,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="506" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="513" y="851.5498">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="22.9951">BB&lt;int,float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="670" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="677" y="851.5498">BB&lt;int,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="22.9951">BB&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="792" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="799" y="851.5498">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="22.9951">AA&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1o0orv4y9u0kj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
+      <rect fill="#FEFECE" filter="url(#f8tgth0t8n7mt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="902" y="831.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="909" y="851.5498">AA&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1o0orv4y9u0kj)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="766.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="578" y="625.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="713.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="726" y="750.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="360.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="837" y="448.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="389.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="477.625"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="565.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="654.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f8tgth0t8n7mt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="935.5" y="784.5547"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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>
@@ -122,12 +122,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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>
@@ -136,69 +136,69 @@
     <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,237.9609,576,241.9609,566,245.9609,570,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="53" y="236.895">BB(AA&lt;int&gt; *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,297.0938,719,301.0938,709,305.0938,713,301.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="301.0938" y2="301.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="99" x="53" y="296.0278">BB(AA&lt;int&gt; &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="825,356.2266,835,360.2266,825,364.2266,829,360.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="360.2266" y2="360.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="355.1606">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,385.3594,933.5,389.3594,923.5,393.3594,927.5,389.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="389.3594" y2="389.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="384.2935">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="825,444.4922,835,448.4922,825,452.4922,829,448.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="831" y1="448.4922" y2="448.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="443.4263">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,473.625,933.5,477.625,923.5,481.625,927.5,477.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="847" x2="929.5" y1="477.625" y2="477.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="854" y="472.5591">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,532.7578,576,536.7578,566,540.7578,570,536.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="536.7578" y2="536.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="531.6919">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,561.8906,933.5,565.8906,923.5,569.8906,927.5,565.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="565.8906" y2="565.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="560.8247">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="566,621.0234,576,625.0234,566,629.0234,570,625.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="572" y1="625.0234" y2="625.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="619.9575">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,650.1563,933.5,654.1563,923.5,658.1563,927.5,654.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="588" x2="929.5" y1="654.1563" y2="654.1563"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="595" y="649.0903">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,709.2891,719,713.2891,709,717.2891,713,713.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="715" y1="713.2891" y2="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="708.2231">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="731" x2="778" y1="737.4219" y2="737.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="778" x2="778" y1="737.4219" y2="750.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="737" x2="778" y1="750.4219" y2="750.4219"/>
       <polygon fill="#A80036" points="747,746.4219,737,750.4219,747,754.4219,743,750.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="743" y="732.356">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="923.5,780.5547,933.5,784.5547,923.5,788.5547,927.5,784.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="736" x2="929.5" y1="784.5547" y2="784.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="743" y="779.4888">aa2(int)</text>
diff --git a/docs/test_cases/t20007.md b/docs/test_cases/t20007.md
index 8b727497..31bd73c9 100644
--- a/docs/test_cases/t20007.md
+++ b/docs/test_cases/t20007.md
@@ -54,6 +54,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20007::tmain()",
       "id": "622662006747239840",
       "name": "tmain",
       "namespace": "clanguml::t20007",
@@ -69,6 +70,7 @@ void tmain()
       "activities": [
         {
           "display_name": "add(int &&,int &&)",
+          "full_name": "clanguml::t20007::Adder<int,int>::add(int &&,int &&)",
           "id": "438133719207269065",
           "name": "add",
           "namespace": "",
@@ -82,6 +84,7 @@ void tmain()
         }
       ],
       "display_name": "Adder<int,int>",
+      "full_name": "clanguml::t20007::Adder<int,int>",
       "id": "1742497005509009302",
       "name": "Adder",
       "namespace": "clanguml::t20007",
@@ -97,6 +100,7 @@ void tmain()
       "activities": [
         {
           "display_name": "add(int &&,float &&,double &&)",
+          "full_name": "clanguml::t20007::Adder<int,float,double>::add(int &&,float &&,double &&)",
           "id": "9522724767688870",
           "name": "add",
           "namespace": "",
@@ -110,6 +114,7 @@ void tmain()
         }
       ],
       "display_name": "Adder<int,float,double>",
+      "full_name": "clanguml::t20007::Adder<int,float,double>",
       "id": "599640474306956868",
       "name": "Adder",
       "namespace": "clanguml::t20007",
@@ -125,6 +130,7 @@ void tmain()
       "activities": [
         {
           "display_name": "add(std::string &&,std::string &&,std::string &&)",
+          "full_name": "clanguml::t20007::Adder<std::string,std::string,std::string>::add(std::string &&,std::string &&,std::string &&)",
           "id": "384866641042941480",
           "name": "add",
           "namespace": "",
@@ -138,6 +144,7 @@ void tmain()
         }
       ],
       "display_name": "Adder<std::string,std::string,std::string>",
+      "full_name": "clanguml::t20007::Adder<std::string,std::string,std::string>",
       "id": "228191787514523926",
       "name": "Adder",
       "namespace": "clanguml::t20007",
@@ -199,7 +206,7 @@ void tmain()
             "participant_id": "622662006747239840"
           },
           "name": "add(std::string &&,std::string &&,std::string &&)",
-          "return_type": "std::basic_string<char>",
+          "return_type": "std::string",
           "scope": "normal",
           "source_location": {
             "column": 34,
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index bcc295e6..c0528cb1 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="f1c214ic2fpf1j" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4hla6dnasl9l" 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(#f1c214ic2fpf1j)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1c214ic2fpf1j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1c214ic2fpf1j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1c214ic2fpf1j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c214ic2fpf1j)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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(#f1c214ic2fpf1j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c214ic2fpf1j)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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(#f1c214ic2fpf1j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c214ic2fpf1j)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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(#f1c214ic2fpf1j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c214ic2fpf1j)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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(#f1c214ic2fpf1j)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f4hla6dnasl9l)" 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(#f1c214ic2fpf1j)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1c214ic2fpf1j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1c214ic2fpf1j)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1c214ic2fpf1j)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f4hla6dnasl9l)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 7db49a43..76969d1d 100644
--- a/docs/test_cases/t20008.md
+++ b/docs/test_cases/t20008.md
@@ -72,6 +72,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20008::tmain()",
       "id": "1180776240543224244",
       "name": "tmain",
       "namespace": "clanguml::t20008",
@@ -87,6 +88,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(int)",
+          "full_name": "clanguml::t20008::B<int>::b(int)",
           "id": "379850145437051189",
           "name": "b",
           "namespace": "",
@@ -100,6 +102,7 @@ void tmain()
         }
       ],
       "display_name": "B<int>",
+      "full_name": "clanguml::t20008::B<int>",
       "id": "1906510289157013670",
       "name": "B",
       "namespace": "clanguml::t20008",
@@ -115,6 +118,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a1(int)",
+          "full_name": "clanguml::t20008::A<int>::a1(int)",
           "id": "2066363630174644719",
           "name": "a1",
           "namespace": "",
@@ -128,6 +132,7 @@ void tmain()
         }
       ],
       "display_name": "A<int>",
+      "full_name": "clanguml::t20008::A<int>",
       "id": "1376149084762923197",
       "name": "A",
       "namespace": "clanguml::t20008",
@@ -143,6 +148,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(const char *)",
+          "full_name": "clanguml::t20008::B<const char *>::b(const char *)",
           "id": "1347162523481637780",
           "name": "b",
           "namespace": "",
@@ -156,6 +162,7 @@ void tmain()
         }
       ],
       "display_name": "B<const char *>",
+      "full_name": "clanguml::t20008::B<const char *>",
       "id": "867098551202196741",
       "name": "B",
       "namespace": "clanguml::t20008",
@@ -171,6 +178,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a2(const char *)",
+          "full_name": "clanguml::t20008::A<const char *>::a2(const char *)",
           "id": "718650834962275580",
           "name": "a2",
           "namespace": "",
@@ -184,6 +192,7 @@ void tmain()
         }
       ],
       "display_name": "A<const char *>",
+      "full_name": "clanguml::t20008::A<const char *>",
       "id": "144833378017373200",
       "name": "A",
       "namespace": "clanguml::t20008",
@@ -199,6 +208,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(std::string)",
+          "full_name": "clanguml::t20008::B<std::string>::b(std::string)",
           "id": "1286410946666951254",
           "name": "b",
           "namespace": "",
@@ -212,6 +222,7 @@ void tmain()
         }
       ],
       "display_name": "B<std::string>",
+      "full_name": "clanguml::t20008::B<std::string>",
       "id": "927702553742507923",
       "name": "B",
       "namespace": "clanguml::t20008",
@@ -227,6 +238,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a3(std::string)",
+          "full_name": "clanguml::t20008::A<std::string>::a3(std::string)",
           "id": "1404594247101138737",
           "name": "a3",
           "namespace": "",
@@ -240,6 +252,7 @@ void tmain()
         }
       ],
       "display_name": "A<std::string>",
+      "full_name": "clanguml::t20008::A<std::string>",
       "id": "390605614583363778",
       "name": "A",
       "namespace": "clanguml::t20008",
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index eb332ea9..2f9237ba 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="f1vplhzuq80ach" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1k5jq0aw0sov1" 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(#f1vplhzuq80ach)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vplhzuq80ach)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vplhzuq80ach)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vplhzuq80ach)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vplhzuq80ach)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vplhzuq80ach)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vplhzuq80ach)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vplhzuq80ach)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1k5jq0aw0sov1)" 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(#f1vplhzuq80ach)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1vplhzuq80ach)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5jq0aw0sov1)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 4df3f8d4..664a6e17 100644
--- a/docs/test_cases/t20009.md
+++ b/docs/test_cases/t20009.md
@@ -58,6 +58,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20009::tmain()",
       "id": "791066686606379857",
       "name": "tmain",
       "namespace": "clanguml::t20009",
@@ -73,6 +74,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(std::string)",
+          "full_name": "clanguml::t20009::B<std::string>::b(std::string)",
           "id": "1960266381909090879",
           "name": "b",
           "namespace": "",
@@ -86,6 +88,7 @@ void tmain()
         }
       ],
       "display_name": "B<std::string>",
+      "full_name": "clanguml::t20009::B<std::string>",
       "id": "450813573860627679",
       "name": "B",
       "namespace": "clanguml::t20009",
@@ -101,6 +104,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a(std::string)",
+          "full_name": "clanguml::t20009::A<std::string>::a(std::string)",
           "id": "1716775846967761286",
           "name": "a",
           "namespace": "",
@@ -114,6 +118,7 @@ void tmain()
         }
       ],
       "display_name": "A<std::string>",
+      "full_name": "clanguml::t20009::A<std::string>",
       "id": "1197403810800583218",
       "name": "A",
       "namespace": "clanguml::t20009",
@@ -129,6 +134,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(int)",
+          "full_name": "clanguml::t20009::B<int>::b(int)",
           "id": "660557928399203634",
           "name": "b",
           "namespace": "",
@@ -142,6 +148,7 @@ void tmain()
         }
       ],
       "display_name": "B<int>",
+      "full_name": "clanguml::t20009::B<int>",
       "id": "2002310682025149090",
       "name": "B",
       "namespace": "clanguml::t20009",
@@ -157,6 +164,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a(int)",
+          "full_name": "clanguml::t20009::A<int>::a(int)",
           "id": "2030629454810805092",
           "name": "a",
           "namespace": "",
@@ -170,6 +178,7 @@ void tmain()
         }
       ],
       "display_name": "A<int>",
+      "full_name": "clanguml::t20009::A<int>",
       "id": "1228498754558363121",
       "name": "A",
       "namespace": "clanguml::t20009",
@@ -185,6 +194,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b(float)",
+          "full_name": "clanguml::t20009::B<float>::b(float)",
           "id": "367805163135583282",
           "name": "b",
           "namespace": "",
@@ -198,6 +208,7 @@ void tmain()
         }
       ],
       "display_name": "B<float>",
+      "full_name": "clanguml::t20009::B<float>",
       "id": "1461902328659683203",
       "name": "B",
       "namespace": "clanguml::t20009",
@@ -213,6 +224,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a(float)",
+          "full_name": "clanguml::t20009::A<float>::a(float)",
           "id": "1643733911490581293",
           "name": "a",
           "namespace": "",
@@ -226,6 +238,7 @@ void tmain()
         }
       ],
       "display_name": "A<float>",
+      "full_name": "clanguml::t20009::A<float>",
       "id": "1243520246309441967",
       "name": "A",
       "namespace": "clanguml::t20009",
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index 7e7c4dde..a7dc00b8 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="fuveogj1x79zy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f137qrvlu4mfog" 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(#fuveogj1x79zy)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuveogj1x79zy)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuveogj1x79zy)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuveogj1x79zy)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuveogj1x79zy)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuveogj1x79zy)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuveogj1x79zy)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuveogj1x79zy)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f137qrvlu4mfog)" 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(#fuveogj1x79zy)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fuveogj1x79zy)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f137qrvlu4mfog)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 56336dc4..600e5f34 100644
--- a/docs/test_cases/t20010.md
+++ b/docs/test_cases/t20010.md
@@ -68,6 +68,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20010::tmain()",
       "id": "1364660609791735244",
       "name": "tmain",
       "namespace": "clanguml::t20010",
@@ -83,6 +84,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b1()",
+          "full_name": "clanguml::t20010::B<int>::b1()",
           "id": "343626060927491836",
           "name": "b1",
           "namespace": "",
@@ -96,6 +98,7 @@ void tmain()
         },
         {
           "display_name": "b2()",
+          "full_name": "clanguml::t20010::B<int>::b2()",
           "id": "1633031113603062043",
           "name": "b2",
           "namespace": "",
@@ -109,6 +112,7 @@ void tmain()
         },
         {
           "display_name": "b3()",
+          "full_name": "clanguml::t20010::B<int>::b3()",
           "id": "786218543654309692",
           "name": "b3",
           "namespace": "",
@@ -122,6 +126,7 @@ void tmain()
         },
         {
           "display_name": "b4()",
+          "full_name": "clanguml::t20010::B<int>::b4()",
           "id": "1866068965397702666",
           "name": "b4",
           "namespace": "",
@@ -135,6 +140,7 @@ void tmain()
         }
       ],
       "display_name": "B<int>",
+      "full_name": "clanguml::t20010::B<int>",
       "id": "2154977200904210115",
       "name": "B",
       "namespace": "clanguml::t20010",
@@ -150,6 +156,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a1()",
+          "full_name": "clanguml::t20010::A::a1()",
           "id": "981184681827469850",
           "name": "a1",
           "namespace": "",
@@ -163,6 +170,7 @@ void tmain()
         },
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20010::A::a2()",
           "id": "664370880632146592",
           "name": "a2",
           "namespace": "",
@@ -176,6 +184,7 @@ void tmain()
         },
         {
           "display_name": "a3()",
+          "full_name": "clanguml::t20010::A::a3()",
           "id": "2145739294823015899",
           "name": "a3",
           "namespace": "",
@@ -189,6 +198,7 @@ void tmain()
         },
         {
           "display_name": "a4()",
+          "full_name": "clanguml::t20010::A::a4()",
           "id": "1224936485834400821",
           "name": "a4",
           "namespace": "",
@@ -202,6 +212,7 @@ void tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20010::A",
       "id": "102070351492425113",
       "name": "A",
       "namespace": "clanguml::t20010",
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 2a8946d7..5a00a566 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="fzdzzdx9g0kqo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fqm8y3bv4x4w2" 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(#fzdzzdx9g0kqo)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzdzzdx9g0kqo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqm8y3bv4x4w2)" 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(#fzdzzdx9g0kqo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fqm8y3bv4x4w2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzdzzdx9g0kqo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqm8y3bv4x4w2)" 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(#fzdzzdx9g0kqo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fqm8y3bv4x4w2)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzdzzdx9g0kqo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqm8y3bv4x4w2)" 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(#fzdzzdx9g0kqo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#fqm8y3bv4x4w2)" 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(#fzdzzdx9g0kqo)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fzdzzdx9g0kqo)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fqm8y3bv4x4w2)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 9fa3443a..e0c1db8a 100644
--- a/docs/test_cases/t20011.md
+++ b/docs/test_cases/t20011.md
@@ -60,6 +60,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20011::tmain()",
       "id": "1866210527166391126",
       "name": "tmain",
       "namespace": "clanguml::t20011",
@@ -75,6 +76,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a(int)",
+          "full_name": "clanguml::t20011::A::a(int)",
           "id": "1647578261840204206",
           "name": "a",
           "namespace": "",
@@ -88,6 +90,7 @@ void tmain()
         },
         {
           "display_name": "b(int)",
+          "full_name": "clanguml::t20011::A::b(int)",
           "id": "305456175818875420",
           "name": "b",
           "namespace": "",
@@ -101,6 +104,7 @@ void tmain()
         },
         {
           "display_name": "c(int)",
+          "full_name": "clanguml::t20011::A::c(int)",
           "id": "963268672079901211",
           "name": "c",
           "namespace": "",
@@ -114,6 +118,7 @@ void tmain()
         },
         {
           "display_name": "d(int)",
+          "full_name": "clanguml::t20011::A::d(int)",
           "id": "1874311762268001137",
           "name": "d",
           "namespace": "",
@@ -127,6 +132,7 @@ void tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20011::A",
       "id": "816061502062128285",
       "name": "A",
       "namespace": "clanguml::t20011",
@@ -298,6 +304,38 @@ void tmain()
                     "participant_id": "816061502062128285"
                   },
                   "type": "message"
+                },
+                {
+                  "activity_id": "1647578261840204206",
+                  "branches": [
+                    {
+                      "messages": [
+                        {
+                          "from": {
+                            "activity_id": "1647578261840204206",
+                            "participant_id": "816061502062128285"
+                          },
+                          "name": "a(int)",
+                          "return_type": "void",
+                          "scope": "normal",
+                          "source_location": {
+                            "column": 13,
+                            "file": "t20011.cc",
+                            "line": 8,
+                            "translation_unit": "t20011.cc"
+                          },
+                          "to": {
+                            "activity_id": "1647578261840204206",
+                            "participant_id": "816061502062128285"
+                          },
+                          "type": "message"
+                        }
+                      ],
+                      "type": "consequent"
+                    }
+                  ],
+                  "name": "if",
+                  "type": "alt"
                 }
               ],
               "type": "consequent"
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index cc031630..5e87647f 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="fvm8nhbmk67wc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fsl6nyqfeaybo" 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(#fvm8nhbmk67wc)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvm8nhbmk67wc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsl6nyqfeaybo)" 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(#fvm8nhbmk67wc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#fsl6nyqfeaybo)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvm8nhbmk67wc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsl6nyqfeaybo)" 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(#fvm8nhbmk67wc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#fsl6nyqfeaybo)" 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(#fvm8nhbmk67wc)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fvm8nhbmk67wc)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fsl6nyqfeaybo)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 d00a8239..6eb66e0d 100644
--- a/docs/test_cases/t20012.md
+++ b/docs/test_cases/t20012.md
@@ -135,6 +135,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20012::tmain()",
       "id": "893699278278125827",
       "name": "tmain",
       "namespace": "clanguml::t20012",
@@ -150,6 +151,7 @@ void tmain()
       "activities": [
         {
           "display_name": "operator()() const",
+          "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()() const",
           "id": "844942554717397525",
           "name": "operator()",
           "namespace": "",
@@ -157,6 +159,7 @@ void tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20012.cc:67:20)",
+      "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)",
       "id": "1823127147500894672",
       "name": "tmain()::(lambda t20012.cc:67:20)",
       "namespace": "clanguml::t20012",
@@ -172,6 +175,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20012::A::a()",
           "id": "1871432932744498976",
           "name": "a",
           "namespace": "",
@@ -185,6 +189,7 @@ void tmain()
         },
         {
           "display_name": "aa()",
+          "full_name": "clanguml::t20012::A::aa()",
           "id": "1100933039353876539",
           "name": "aa",
           "namespace": "",
@@ -198,6 +203,7 @@ void tmain()
         },
         {
           "display_name": "aaa()",
+          "full_name": "clanguml::t20012::A::aaa()",
           "id": "941636185823691898",
           "name": "aaa",
           "namespace": "",
@@ -211,6 +217,7 @@ void tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20012::A",
       "id": "1798184226128732119",
       "name": "A",
       "namespace": "clanguml::t20012",
@@ -226,6 +233,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b()",
+          "full_name": "clanguml::t20012::B::b()",
           "id": "2142697410385270633",
           "name": "b",
           "namespace": "",
@@ -239,6 +247,7 @@ void tmain()
         },
         {
           "display_name": "bb()",
+          "full_name": "clanguml::t20012::B::bb()",
           "id": "973718340784931313",
           "name": "bb",
           "namespace": "",
@@ -252,6 +261,7 @@ void tmain()
         },
         {
           "display_name": "bbb()",
+          "full_name": "clanguml::t20012::B::bbb()",
           "id": "195788529004378403",
           "name": "bbb",
           "namespace": "",
@@ -265,6 +275,7 @@ void tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20012::B",
       "id": "1893469899260202653",
       "name": "B",
       "namespace": "clanguml::t20012",
@@ -280,6 +291,7 @@ void tmain()
       "activities": [
         {
           "display_name": "operator()() const",
+          "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()() const",
           "id": "2080867854705352490",
           "name": "operator()",
           "namespace": "",
@@ -287,6 +299,7 @@ void tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20012.cc:80:20)",
+      "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)",
       "id": "2103332104162021186",
       "name": "tmain()::(lambda t20012.cc:80:20)",
       "namespace": "clanguml::t20012",
@@ -302,6 +315,7 @@ void tmain()
       "activities": [
         {
           "display_name": "c()",
+          "full_name": "clanguml::t20012::C::c()",
           "id": "675369415318225607",
           "name": "c",
           "namespace": "",
@@ -315,6 +329,7 @@ void tmain()
         },
         {
           "display_name": "cc()",
+          "full_name": "clanguml::t20012::C::cc()",
           "id": "1451821704315336057",
           "name": "cc",
           "namespace": "",
@@ -328,6 +343,7 @@ void tmain()
         },
         {
           "display_name": "ccc()",
+          "full_name": "clanguml::t20012::C::ccc()",
           "id": "1956141408799600460",
           "name": "ccc",
           "namespace": "",
@@ -341,6 +357,7 @@ void tmain()
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20012::C",
       "id": "2071958121786360262",
       "name": "C",
       "namespace": "clanguml::t20012",
@@ -356,6 +373,7 @@ void tmain()
       "activities": [
         {
           "display_name": "R((lambda at t20012.cc:86:9) &&)",
+          "full_name": "clanguml::t20012::R<(lambda at t20012.cc:86:9)>::R((lambda at t20012.cc:86:9) &&)",
           "id": "1976182450987832927",
           "name": "R",
           "namespace": "",
@@ -369,6 +387,7 @@ void tmain()
         },
         {
           "display_name": "r()",
+          "full_name": "clanguml::t20012::R<(lambda at t20012.cc:86:9)>::r()",
           "id": "1627963942447215983",
           "name": "r",
           "namespace": "",
@@ -382,6 +401,7 @@ void tmain()
         }
       ],
       "display_name": "R<(lambda at t20012.cc:86:9)>",
+      "full_name": "clanguml::t20012::R<(lambda at t20012.cc:86:9)>",
       "id": "1418878159628415236",
       "name": "R",
       "namespace": "clanguml::t20012",
@@ -397,6 +417,7 @@ void tmain()
       "activities": [
         {
           "display_name": "operator()() const",
+          "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)::operator()() const",
           "id": "997617437879117371",
           "name": "operator()",
           "namespace": "",
@@ -404,6 +425,7 @@ void tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20012.cc:86:9)",
+      "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)",
       "id": "1523229682883773614",
       "name": "tmain()::(lambda t20012.cc:86:9)",
       "namespace": "clanguml::t20012",
@@ -419,6 +441,7 @@ void tmain()
       "activities": [
         {
           "display_name": "operator()(auto) const",
+          "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:94:9)::operator()(auto) const",
           "id": "1625806587339243213",
           "name": "operator()",
           "namespace": "",
@@ -426,6 +449,7 @@ void tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20012.cc:94:9)",
+      "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:94:9)",
       "id": "1585686021763298522",
       "name": "tmain()::(lambda t20012.cc:94:9)",
       "namespace": "clanguml::t20012",
@@ -441,6 +465,7 @@ void tmain()
       "activities": [
         {
           "display_name": "add5(int) const",
+          "full_name": "clanguml::t20012::D::add5(int) const",
           "id": "379068559069876883",
           "name": "add5",
           "namespace": "",
@@ -454,6 +479,7 @@ void tmain()
         }
       ],
       "display_name": "D",
+      "full_name": "clanguml::t20012::D",
       "id": "1627226326147373737",
       "name": "D",
       "namespace": "clanguml::t20012",
@@ -709,6 +735,126 @@ void tmain()
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "844942554717397525",
+            "participant_id": "1823127147500894672"
+          },
+          "name": "a()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 9,
+            "file": "t20012.cc",
+            "line": 68,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "1871432932744498976",
+            "participant_id": "1798184226128732119"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1871432932744498976",
+            "participant_id": "1798184226128732119"
+          },
+          "name": "aa()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 16,
+            "file": "t20012.cc",
+            "line": 11,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "1100933039353876539",
+            "participant_id": "1798184226128732119"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1100933039353876539",
+            "participant_id": "1798184226128732119"
+          },
+          "name": "aaa()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 17,
+            "file": "t20012.cc",
+            "line": 13,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "941636185823691898",
+            "participant_id": "1798184226128732119"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "844942554717397525",
+            "participant_id": "1823127147500894672"
+          },
+          "name": "b()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 9,
+            "file": "t20012.cc",
+            "line": 69,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "2142697410385270633",
+            "participant_id": "1893469899260202653"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2142697410385270633",
+            "participant_id": "1893469899260202653"
+          },
+          "name": "bb()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 16,
+            "file": "t20012.cc",
+            "line": 19,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "973718340784931313",
+            "participant_id": "1893469899260202653"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "973718340784931313",
+            "participant_id": "1893469899260202653"
+          },
+          "name": "bbb()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 17,
+            "file": "t20012.cc",
+            "line": 21,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "195788529004378403",
+            "participant_id": "1893469899260202653"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "893699278278125827",
@@ -789,6 +935,46 @@ void tmain()
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "675369415318225607",
+            "participant_id": "2071958121786360262"
+          },
+          "name": "cc()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 16,
+            "file": "t20012.cc",
+            "line": 29,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "1451821704315336057",
+            "participant_id": "2071958121786360262"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1451821704315336057",
+            "participant_id": "2071958121786360262"
+          },
+          "name": "ccc()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 17,
+            "file": "t20012.cc",
+            "line": 31,
+            "translation_unit": "t20012.cc"
+          },
+          "to": {
+            "activity_id": "1956141408799600460",
+            "participant_id": "2071958121786360262"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "893699278278125827",
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index 6f479003..e1828115 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="1250px" preserveAspectRatio="none" style="width:1554px;height:1250px;" version="1.1" viewBox="0 0 1554 1250" width="1554px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnjykf5kp07lm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgpqawas0pkqm" 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,33 +9,33 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="1143.4531" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="557.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="587.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="624.1563"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="730.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="767.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="809.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="452.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="385.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="414.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="451.625"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="493.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="991.2188"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1028.3516"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1070.4844"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="873.8203"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="165.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="932.9531"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1123" y="962.0859"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1380" y="1134.6172"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1528" y="1163.75"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="1143.4531" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="557.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="587.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="624.1563"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="730.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="767.5547"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="809.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="452.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="385.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="414.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="451.625"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="493.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="991.2188"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1028.3516"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1070.4844"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="873.8203"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="165.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="932.9531"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1123" y="962.0859"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1380" y="1134.6172"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1528" y="1163.75"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1209.75"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="212" x2="212" y1="38.2969" y2="1209.75"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="363" x2="363" y1="38.2969" y2="1209.75"/>
@@ -46,243 +46,243 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1127.5" x2="1127.5" y1="38.2969" y2="1209.75"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1384.5" x2="1384.5" y1="38.2969" y2="1209.75"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1532.5" x2="1532.5" y1="38.2969" y2="1209.75"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" 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(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1228.7451">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L67" target="_top" title="tmain()##(lambda t20012.cc:67:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:67:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="22.9951">tmain()::(lambda t20012.cc:67:20)</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="84" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="91" y="1228.7451">tmain()::(lambda t20012.cc:67:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="350" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="357" y="1228.7451">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="412.5" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="419.5" y="1228.7451">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L80" target="_top" title="tmain()##(lambda t20012.cc:80:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:80:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="22.9951">tmain()::(lambda t20012.cc:80:20)</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="450.5" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="457.5" y="1228.7451">tmain()::(lambda t20012.cc:80:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="716.5" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="723.5" y="1228.7451">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="754.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="754.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="222" x="761.5" y="22.9951">R&lt;(lambda at t20012.cc:86:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="754.5" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="754.5" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="222" x="761.5" y="1228.7451">R&lt;(lambda at t20012.cc:86:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1004.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L86" target="_top" title="tmain()##(lambda t20012.cc:86:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:86:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1004.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1011.5" y="22.9951">tmain()::(lambda t20012.cc:86:9)</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1004.5" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1004.5" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1011.5" y="1228.7451">tmain()::(lambda t20012.cc:86:9)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L94" target="_top" title="tmain()##(lambda t20012.cc:94:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L94" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:94:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1261.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L94" target="_top" title="tmain()##(lambda t20012.cc:94:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L94" xlink:show="new" xlink:title="tmain()##(lambda t20012.cc:94:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1261.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1268.5" y="22.9951">tmain()::(lambda t20012.cc:94:9)</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1261.5" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1261.5" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1268.5" y="1228.7451">tmain()::(lambda t20012.cc:94:9)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1518.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1518.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1525.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#fnjykf5kp07lm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1518.5" y="1208.75"/>
+      <rect fill="#FEFECE" filter="url(#fgpqawas0pkqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1518.5" y="1208.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1525.5" y="1228.7451">D</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="1143.4531" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="557.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="587.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="624.1563"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="730.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="767.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="809.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="452.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="385.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="414.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="451.625"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="493.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="991.2188"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1028.3516"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1070.4844"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="873.8203"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="165.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="932.9531"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1123" y="962.0859"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1380" y="1134.6172"/>
-    <rect fill="#FFFFFF" filter="url(#fnjykf5kp07lm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1528" y="1163.75"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="1143.4531" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="279.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="207" y="557.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="358.5" y="587.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="363.5" y="624.1563"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="368.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="421.5" y="730.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="426.5" y="767.5547"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="431.5" y="809.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="452.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="573.5" y="385.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="414.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="451.625"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="493.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="725.5" y="991.2188"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="730.5" y="1028.3516"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="735.5" y="1070.4844"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="873.8203"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="165.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="869.5" y="932.9531"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1123" y="962.0859"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1380" y="1134.6172"/>
+    <rect fill="#FFFFFF" filter="url(#fgpqawas0pkqm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1528" y="1163.75"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="195,65.4297,205,69.4297,195,73.4297,199,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="201" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="53" y="64.3638">operator()() const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="346.5,94.5625,356.5,98.5625,346.5,102.5625,350.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="93.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="384.5,131.6953,374.5,135.6953,384.5,139.6953,380.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="380.5" y="117.6294">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="169.8281" y2="169.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="169.8281" y2="182.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="182.8281" y2="182.8281"/>
       <polygon fill="#A80036" points="389.5,178.8281,379.5,182.8281,389.5,186.8281,385.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="385.5" y="164.7622">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="409.5,237.9609,419.5,241.9609,409.5,245.9609,413.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="236.895">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="266.0938" y2="266.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="266.0938" y2="279.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="279.0938" y2="279.0938"/>
       <polygon fill="#A80036" points="447.5,275.0938,437.5,279.0938,447.5,283.0938,443.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="443.5" y="261.0278">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="313.2266" y2="313.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="313.2266" y2="326.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="326.2266" y2="326.2266"/>
       <polygon fill="#A80036" points="452.5,322.2266,442.5,326.2266,452.5,330.2266,448.5,326.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="448.5" y="308.1606">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="561.5,381.3594,571.5,385.3594,561.5,389.3594,565.5,385.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="567.5" y1="385.3594" y2="385.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="53" y="380.2935">operator()() const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="713.5,410.4922,723.5,414.4922,713.5,418.4922,717.5,414.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="583.5" x2="719.5" y1="414.4922" y2="414.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="590.5" y="409.4263">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="438.625" y2="438.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="438.625" y2="451.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="451.625" y2="451.625"/>
       <polygon fill="#A80036" points="751.5,447.625,741.5,451.625,751.5,455.625,747.5,451.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="433.5591">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="485.7578" y2="485.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="485.7578" y2="498.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="498.7578" y2="498.7578"/>
       <polygon fill="#A80036" points="756.5,494.7578,746.5,498.7578,756.5,502.7578,752.5,498.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="752.5" y="480.6919">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L82" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L82" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="228,553.8906,218,557.8906,228,561.8906,224,557.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="572.5" y1="557.8906" y2="557.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="234" y="552.8247">operator()() const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="346.5,583.0234,356.5,587.0234,346.5,591.0234,350.5,587.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="352.5" y1="587.0234" y2="587.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="581.9575">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="368.5" x2="415.5" y1="611.1563" y2="611.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="415.5" x2="415.5" y1="611.1563" y2="624.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="374.5" x2="415.5" y1="624.1563" y2="624.1563"/>
       <polygon fill="#A80036" points="384.5,620.1563,374.5,624.1563,384.5,628.1563,380.5,624.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="380.5" y="606.0903">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="378.5" x2="420.5" y1="658.2891" y2="658.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="420.5" x2="420.5" y1="658.2891" y2="671.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="379.5" x2="420.5" y1="671.2891" y2="671.2891"/>
       <polygon fill="#A80036" points="389.5,667.2891,379.5,671.2891,389.5,675.2891,385.5,671.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="385.5" y="653.2231">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="409.5,726.4219,419.5,730.4219,409.5,734.4219,413.5,730.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217" x2="415.5" y1="730.4219" y2="730.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="224" y="725.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="431.5" x2="478.5" y1="754.5547" y2="754.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="478.5" x2="478.5" y1="754.5547" y2="767.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="437.5" x2="478.5" y1="767.5547" y2="767.5547"/>
       <polygon fill="#A80036" points="447.5,763.5547,437.5,767.5547,447.5,771.5547,443.5,767.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="443.5" y="749.4888">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="441.5" x2="483.5" y1="801.6875" y2="801.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="483.5" x2="483.5" y1="801.6875" y2="814.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="442.5" x2="483.5" y1="814.6875" y2="814.6875"/>
       <polygon fill="#A80036" points="452.5,810.6875,442.5,814.6875,452.5,818.6875,448.5,814.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="448.5" y="796.6216">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="857.5,869.8203,867.5,873.8203,857.5,877.8203,861.5,873.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="863.5" y1="873.8203" y2="873.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="218" x="53" y="868.7544">R((lambda at t20012.cc:86:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="857.5,928.9531,867.5,932.9531,857.5,936.9531,861.5,932.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="863.5" y1="932.9531" y2="932.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="927.8872">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1111,958.0859,1121,962.0859,1111,966.0859,1115,962.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="879.5" x2="1117" y1="962.0859" y2="962.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="886.5" y="957.02">operator()() const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="746.5,987.2188,736.5,991.2188,746.5,995.2188,742.5,991.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="740.5" x2="1122" y1="991.2188" y2="991.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="752.5" y="986.1528">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="735.5" x2="782.5" y1="1015.3516" y2="1015.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="782.5" x2="782.5" y1="1015.3516" y2="1028.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="741.5" x2="782.5" y1="1028.3516" y2="1028.3516"/>
       <polygon fill="#A80036" points="751.5,1024.3516,741.5,1028.3516,751.5,1032.3516,747.5,1028.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="747.5" y="1010.2856">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="745.5" x2="787.5" y1="1062.4844" y2="1062.4844"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="787.5" x2="787.5" y1="1062.4844" y2="1075.4844"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="746.5" x2="787.5" y1="1075.4844" y2="1075.4844"/>
       <polygon fill="#A80036" points="756.5,1071.4844,746.5,1075.4844,756.5,1079.4844,752.5,1075.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="752.5" y="1057.4185">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L94" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L94" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L94" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L94" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1368,1130.6172,1378,1134.6172,1368,1138.6172,1372,1134.6172" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1374" y1="1134.6172" y2="1134.6172"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="53" y="1129.5513">operator()(auto) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L94" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20012/t20012.cc#L94" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L94" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20012/t20012.cc#L94" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1516,1159.75,1526,1163.75,1516,1167.75,1520,1163.75" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1390" x2="1522" y1="1163.75" y2="1163.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="97" x="1397" y="1158.6841">add5(int) const</text>
diff --git a/docs/test_cases/t20013.md b/docs/test_cases/t20013.md
index 98eef980..261586f4 100644
--- a/docs/test_cases/t20013.md
+++ b/docs/test_cases/t20013.md
@@ -56,6 +56,7 @@ void tmain(int argc, char **argv)
   "participants": [
     {
       "display_name": "tmain(int,char **)",
+      "full_name": "clanguml::t20013::tmain(int,char **)",
       "id": "1249768632077843821",
       "name": "tmain",
       "namespace": "clanguml::t20013",
@@ -71,6 +72,7 @@ void tmain(int argc, char **argv)
       "activities": [
         {
           "display_name": "b(int)",
+          "full_name": "clanguml::t20013::B::b(int)",
           "id": "2144804108273682993",
           "name": "b",
           "namespace": "",
@@ -84,6 +86,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "b(double)",
+          "full_name": "clanguml::t20013::B::b(double)",
           "id": "640747884486165287",
           "name": "b",
           "namespace": "",
@@ -97,6 +100,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "b(const char *)",
+          "full_name": "clanguml::t20013::B::b(const char *)",
           "id": "1066935874364409142",
           "name": "b",
           "namespace": "",
@@ -110,6 +114,7 @@ void tmain(int argc, char **argv)
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20013::B",
       "id": "1106407610612951303",
       "name": "B",
       "namespace": "clanguml::t20013",
@@ -125,6 +130,7 @@ void tmain(int argc, char **argv)
       "activities": [
         {
           "display_name": "a1(int)",
+          "full_name": "clanguml::t20013::A::a1(int)",
           "id": "1034027282942033004",
           "name": "a1",
           "namespace": "",
@@ -138,6 +144,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "a2(double)",
+          "full_name": "clanguml::t20013::A::a2(double)",
           "id": "394053399890813915",
           "name": "a2",
           "namespace": "",
@@ -151,6 +158,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "a3(const char *)",
+          "full_name": "clanguml::t20013::A::a3(const char *)",
           "id": "1841239321495867611",
           "name": "a3",
           "namespace": "",
@@ -164,6 +172,7 @@ void tmain(int argc, char **argv)
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20013::A",
       "id": "976623130699225079",
       "name": "A",
       "namespace": "clanguml::t20013",
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index b3bca1da..045dd983 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="f11t1u0z7s0cvx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="feqrsl3vsn1qh" 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(#f11t1u0z7s0cvx)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11t1u0z7s0cvx)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#feqrsl3vsn1qh)" 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(#f11t1u0z7s0cvx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#feqrsl3vsn1qh)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11t1u0z7s0cvx)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#feqrsl3vsn1qh)" 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(#f11t1u0z7s0cvx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#feqrsl3vsn1qh)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11t1u0z7s0cvx)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#feqrsl3vsn1qh)" 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(#f11t1u0z7s0cvx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#feqrsl3vsn1qh)" 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(#f11t1u0z7s0cvx)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f11t1u0z7s0cvx)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#feqrsl3vsn1qh)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 59d155bd..d389364a 100644
--- a/docs/test_cases/t20014.md
+++ b/docs/test_cases/t20014.md
@@ -155,6 +155,7 @@ struct A {
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20014::tmain()",
       "id": "512436830818921250",
       "name": "tmain",
       "namespace": "clanguml::t20014",
@@ -170,6 +171,7 @@ struct A {
       "activities": [
         {
           "display_name": "b1(int,int)",
+          "full_name": "clanguml::t20014::B::b1(int,int)",
           "id": "1251633571711578431",
           "name": "b1",
           "namespace": "",
@@ -183,6 +185,7 @@ struct A {
         },
         {
           "display_name": "b2(int,int)",
+          "full_name": "clanguml::t20014::B::b2(int,int)",
           "id": "767830966714379991",
           "name": "b2",
           "namespace": "",
@@ -196,6 +199,7 @@ struct A {
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20014::B",
       "id": "1537634076295867978",
       "name": "B",
       "namespace": "clanguml::t20014",
@@ -211,6 +215,7 @@ struct A {
       "activities": [
         {
           "display_name": "a1(int,int)",
+          "full_name": "clanguml::t20014::A::a1(int,int)",
           "id": "1753682948110709616",
           "name": "a1",
           "namespace": "",
@@ -224,6 +229,7 @@ struct A {
         },
         {
           "display_name": "a2(int,int)",
+          "full_name": "clanguml::t20014::A::a2(int,int)",
           "id": "1943487088673912694",
           "name": "a2",
           "namespace": "",
@@ -237,6 +243,7 @@ struct A {
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20014::A",
       "id": "1504706415756333840",
       "name": "A",
       "namespace": "clanguml::t20014",
@@ -252,6 +259,7 @@ struct A {
       "activities": [
         {
           "display_name": "c1(int,int)",
+          "full_name": "clanguml::t20014::C<clanguml::t20014::B,int>::c1(int,int)",
           "id": "407559038402563981",
           "name": "c1",
           "namespace": "",
@@ -265,6 +273,7 @@ struct A {
         }
       ],
       "display_name": "C<B,int>",
+      "full_name": "clanguml::t20014::C<clanguml::t20014::B,int>",
       "id": "500712304857049435",
       "name": "C",
       "namespace": "clanguml::t20014",
@@ -399,6 +408,26 @@ struct A {
             "participant_id": "1537634076295867978"
           },
           "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1251633571711578431",
+            "participant_id": "1537634076295867978"
+          },
+          "name": "a1(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "column": 34,
+            "file": "t20014_b.cc",
+            "line": 5,
+            "translation_unit": "t20014_b.cc"
+          },
+          "to": {
+            "activity_id": "1753682948110709616",
+            "participant_id": "1504706415756333840"
+          },
+          "type": "message"
         }
       ],
       "start_from": {
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index 559ac2ea..91f4294a 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="f19fbd1c0w2c9n" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1grho6d6vrw9v" 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(#f19fbd1c0w2c9n)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19fbd1c0w2c9n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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(#f19fbd1c0w2c9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19fbd1c0w2c9n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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(#f19fbd1c0w2c9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19fbd1c0w2c9n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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(#f19fbd1c0w2c9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19fbd1c0w2c9n)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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(#f19fbd1c0w2c9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1grho6d6vrw9v)" 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(#f19fbd1c0w2c9n)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f19fbd1c0w2c9n)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1grho6d6vrw9v)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 3cd38edd..65d268b0 100644
--- a/docs/test_cases/t20015.md
+++ b/docs/test_cases/t20015.md
@@ -72,6 +72,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20015::tmain()",
       "id": "1011496551872082945",
       "name": "tmain",
       "namespace": "clanguml::t20015",
@@ -87,6 +88,7 @@ void tmain()
       "activities": [
         {
           "display_name": "setup_a(std::shared_ptr<detail::A> &)",
+          "full_name": "clanguml::t20015::B::setup_a(std::shared_ptr<detail::A> &)",
           "id": "431575772398797060",
           "name": "setup_a",
           "namespace": "",
@@ -100,6 +102,7 @@ void tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20015::B",
       "id": "1302656676783358645",
       "name": "B",
       "namespace": "clanguml::t20015",
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index dd49de9a..ab2bc1a6 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="fe3wgvj3w1z34" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1p92rlud1kfdm" 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(#fe3wgvj3w1z34)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fe3wgvj3w1z34)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1p92rlud1kfdm)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1p92rlud1kfdm)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3wgvj3w1z34)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1p92rlud1kfdm)" 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(#fe3wgvj3w1z34)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1p92rlud1kfdm)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fe3wgvj3w1z34)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1p92rlud1kfdm)" 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(#fe3wgvj3w1z34)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1p92rlud1kfdm)" 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(#fe3wgvj3w1z34)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fe3wgvj3w1z34)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1p92rlud1kfdm)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1p92rlud1kfdm)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 1dd9921c..4ae5396b 100644
--- a/docs/test_cases/t20016.md
+++ b/docs/test_cases/t20016.md
@@ -54,6 +54,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20016::tmain()",
       "id": "1912662358651926712",
       "name": "tmain",
       "namespace": "clanguml::t20016",
@@ -69,6 +70,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b1(long)",
+          "full_name": "clanguml::t20016::B<long>::b1(long)",
           "id": "2064264710178722261",
           "name": "b1",
           "namespace": "",
@@ -82,6 +84,7 @@ void tmain()
         },
         {
           "display_name": "b2(long)",
+          "full_name": "clanguml::t20016::B<long>::b2(long)",
           "id": "203381140188081853",
           "name": "b2",
           "namespace": "",
@@ -95,6 +98,7 @@ void tmain()
         }
       ],
       "display_name": "B<long>",
+      "full_name": "clanguml::t20016::B<long>",
       "id": "1688340912643326666",
       "name": "B",
       "namespace": "clanguml::t20016",
@@ -110,6 +114,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a1(int)",
+          "full_name": "clanguml::t20016::A::a1(int)",
           "id": "1198371121423942542",
           "name": "a1",
           "namespace": "",
@@ -123,6 +128,7 @@ void tmain()
         },
         {
           "display_name": "a2(const long &)",
+          "full_name": "clanguml::t20016::A::a2(const long &)",
           "id": "1208784669530380166",
           "name": "a2",
           "namespace": "",
@@ -136,6 +142,7 @@ void tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20016::A",
       "id": "1351242594275053195",
       "name": "A",
       "namespace": "clanguml::t20016",
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index 5b7605e1..47c0ad3b 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="f12pxfbgyk33kq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f12rehh2o4rdso" 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(#f12pxfbgyk33kq)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12pxfbgyk33kq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12rehh2o4rdso)" 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(#f12pxfbgyk33kq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f12rehh2o4rdso)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12pxfbgyk33kq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12rehh2o4rdso)" 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(#f12pxfbgyk33kq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f12rehh2o4rdso)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12pxfbgyk33kq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12rehh2o4rdso)" 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(#f12pxfbgyk33kq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f12rehh2o4rdso)" 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(#f12pxfbgyk33kq)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f12pxfbgyk33kq)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f12rehh2o4rdso)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 f783f2c3..b3db9d52 100644
--- a/docs/test_cases/t20017.md
+++ b/docs/test_cases/t20017.md
@@ -77,6 +77,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
       "activities": [
         {
           "display_name": "tmain()",
+          "full_name": "clanguml::t20017::tmain()",
           "id": "1484746432546296115",
           "name": "tmain",
           "namespace": "clanguml::t20017",
@@ -90,6 +91,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
         }
       ],
       "display_name": "t20017.cc",
+      "full_name": "clanguml::t20017::tmain()",
       "id": "294332401323799021",
       "name": "t20017.cc",
       "namespace": "clanguml::t20017",
@@ -99,6 +101,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
       "activities": [
         {
           "display_name": "a3(int,int)",
+          "full_name": "clanguml::t20017::a3(int,int)",
           "id": "1681392050252260928",
           "name": "a3",
           "namespace": "clanguml::t20017",
@@ -112,6 +115,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
         },
         {
           "display_name": "a2(int,int)",
+          "full_name": "clanguml::t20017::a2(int,int)",
           "id": "291553542743365259",
           "name": "a2",
           "namespace": "clanguml::t20017",
@@ -125,6 +129,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
         },
         {
           "display_name": "a1(int,int)",
+          "full_name": "clanguml::t20017::a1(int,int)",
           "id": "113759676939330212",
           "name": "a1",
           "namespace": "clanguml::t20017",
@@ -138,6 +143,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
         }
       ],
       "display_name": "include/t20017_a.h",
+      "full_name": "clanguml::t20017::a3(int,int)",
       "id": "1591222867263639510",
       "name": "t20017_a.h",
       "namespace": "clanguml::t20017",
@@ -147,6 +153,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
       "activities": [
         {
           "display_name": "b1(int,int)",
+          "full_name": "clanguml::t20017::b1(int,int)",
           "id": "1714277838806105702",
           "name": "b1",
           "namespace": "clanguml::t20017",
@@ -160,6 +167,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
         },
         {
           "display_name": "b2<int>(int,int)",
+          "full_name": "clanguml::t20017::b2<int>(int,int)",
           "id": "775081116464505528",
           "name": "b2",
           "namespace": "clanguml::t20017",
@@ -173,6 +181,7 @@ template <typename T> T b2(T x, T y) { return x / y; }
         }
       ],
       "display_name": "include/t20017_b.h",
+      "full_name": "clanguml::t20017::b1(int,int)",
       "id": "1113611539183189365",
       "name": "t20017_b.h",
       "namespace": "clanguml::t20017",
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index 3af71db0..24207b4a 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="f16hvb5v6tia10" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1q619tquuuf9a" 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(#f16hvb5v6tia10)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" 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(#f16hvb5v6tia10)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
+    <rect fill="#FEFECE" filter="url(#f1q619tquuuf9a)" 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(#f16hvb5v6tia10)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#f1q619tquuuf9a)" 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(#f16hvb5v6tia10)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
+    <rect fill="#FEFECE" filter="url(#f1q619tquuuf9a)" 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(#f16hvb5v6tia10)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#f1q619tquuuf9a)" 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(#f16hvb5v6tia10)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
+    <rect fill="#FEFECE" filter="url(#f1q619tquuuf9a)" 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(#f16hvb5v6tia10)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#f1q619tquuuf9a)" 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(#f16hvb5v6tia10)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f16hvb5v6tia10)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1q619tquuuf9a)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 79814f4e..fb4c5e30 100644
--- a/docs/test_cases/t20018.md
+++ b/docs/test_cases/t20018.md
@@ -56,6 +56,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20018::tmain()",
       "id": "227581758025403815",
       "name": "tmain",
       "namespace": "clanguml::t20018",
@@ -71,6 +72,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "activities": [
         {
           "display_name": "print()",
+          "full_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>::print()",
           "id": "1185770766239304952",
           "name": "print",
           "namespace": "",
@@ -84,6 +86,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         }
       ],
       "display_name": "Answer<Factorial<5>,120>",
+      "full_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>",
       "id": "1163521725351533502",
       "name": "Answer",
       "namespace": "clanguml::t20018",
@@ -99,6 +102,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "activities": [
         {
           "display_name": "print(int)",
+          "full_name": "clanguml::t20018::Factorial<5>::print(int)",
           "id": "833100888453299461",
           "name": "print",
           "namespace": "",
@@ -112,6 +116,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         }
       ],
       "display_name": "Factorial<5>",
+      "full_name": "clanguml::t20018::Factorial<5>",
       "id": "1482779373563849921",
       "name": "Factorial",
       "namespace": "clanguml::t20018",
@@ -127,6 +132,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "activities": [
         {
           "display_name": "print(int)",
+          "full_name": "clanguml::t20018::Factorial<4>::print(int)",
           "id": "1782586643813991247",
           "name": "print",
           "namespace": "",
@@ -140,6 +146,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         }
       ],
       "display_name": "Factorial<4>",
+      "full_name": "clanguml::t20018::Factorial<4>",
       "id": "52416404065514823",
       "name": "Factorial",
       "namespace": "clanguml::t20018",
@@ -155,6 +162,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "activities": [
         {
           "display_name": "print(int)",
+          "full_name": "clanguml::t20018::Factorial<3>::print(int)",
           "id": "1238078028595736678",
           "name": "print",
           "namespace": "",
@@ -168,6 +176,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         }
       ],
       "display_name": "Factorial<3>",
+      "full_name": "clanguml::t20018::Factorial<3>",
       "id": "1658728078296100018",
       "name": "Factorial",
       "namespace": "clanguml::t20018",
@@ -183,6 +192,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "activities": [
         {
           "display_name": "print(int)",
+          "full_name": "clanguml::t20018::Factorial<2>::print(int)",
           "id": "2163270950475476780",
           "name": "print",
           "namespace": "",
@@ -196,6 +206,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         }
       ],
       "display_name": "Factorial<2>",
+      "full_name": "clanguml::t20018::Factorial<2>",
       "id": "969903469166760124",
       "name": "Factorial",
       "namespace": "clanguml::t20018",
@@ -211,6 +222,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "activities": [
         {
           "display_name": "print(int)",
+          "full_name": "clanguml::t20018::Factorial<1>::print(int)",
           "id": "501166016325937670",
           "name": "print",
           "namespace": "",
@@ -224,6 +236,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         }
       ],
       "display_name": "Factorial<1>",
+      "full_name": "clanguml::t20018::Factorial<1>",
       "id": "2032621198190600516",
       "name": "Factorial",
       "namespace": "clanguml::t20018",
@@ -239,6 +252,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
       "activities": [
         {
           "display_name": "print(int)",
+          "full_name": "clanguml::t20018::Factorial<0>::print(int)",
           "id": "577232827352391544",
           "name": "print",
           "namespace": "",
@@ -252,6 +266,7 @@ void tmain() { Answer<Factorial<5>>::print(); }
         }
       ],
       "display_name": "Factorial<0>",
+      "full_name": "clanguml::t20018::Factorial<0>",
       "id": "1581865799666386458",
       "name": "Factorial",
       "namespace": "clanguml::t20018",
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index 2ade440b..6b7fcbdc 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="f7cmlg6mcf1cw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f19s6oh9h7w7c6" 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(#f7cmlg6mcf1cw)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7cmlg6mcf1cw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f19s6oh9h7w7c6)" 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(#f7cmlg6mcf1cw)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f7cmlg6mcf1cw)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f19s6oh9h7w7c6)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 b8f1358d..b8a58ad4 100644
--- a/docs/test_cases/t20019.md
+++ b/docs/test_cases/t20019.md
@@ -63,6 +63,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20019::tmain()",
       "id": "375304196268652861",
       "name": "tmain",
       "namespace": "clanguml::t20019",
@@ -78,6 +79,7 @@ void tmain()
       "activities": [
         {
           "display_name": "name()",
+          "full_name": "clanguml::t20019::Base<clanguml::t20019::D1>::name()",
           "id": "1038853547136467401",
           "name": "name",
           "namespace": "",
@@ -91,6 +93,7 @@ void tmain()
         }
       ],
       "display_name": "Base<D1>",
+      "full_name": "clanguml::t20019::Base<clanguml::t20019::D1>",
       "id": "381327373934972004",
       "name": "Base",
       "namespace": "clanguml::t20019",
@@ -106,6 +109,7 @@ void tmain()
       "activities": [
         {
           "display_name": "impl()",
+          "full_name": "clanguml::t20019::D1::impl()",
           "id": "603969604599968603",
           "name": "impl",
           "namespace": "",
@@ -119,6 +123,7 @@ void tmain()
         }
       ],
       "display_name": "D1",
+      "full_name": "clanguml::t20019::D1",
       "id": "1282259011856139592",
       "name": "D1",
       "namespace": "clanguml::t20019",
@@ -134,6 +139,7 @@ void tmain()
       "activities": [
         {
           "display_name": "name()",
+          "full_name": "clanguml::t20019::Base<clanguml::t20019::D2>::name()",
           "id": "1918672956676175365",
           "name": "name",
           "namespace": "",
@@ -147,6 +153,7 @@ void tmain()
         }
       ],
       "display_name": "Base<D2>",
+      "full_name": "clanguml::t20019::Base<clanguml::t20019::D2>",
       "id": "1659477498076328530",
       "name": "Base",
       "namespace": "clanguml::t20019",
@@ -162,6 +169,7 @@ void tmain()
       "activities": [
         {
           "display_name": "impl()",
+          "full_name": "clanguml::t20019::D2::impl()",
           "id": "861400435979772695",
           "name": "impl",
           "namespace": "",
@@ -175,6 +183,7 @@ void tmain()
         }
       ],
       "display_name": "D2",
+      "full_name": "clanguml::t20019::D2",
       "id": "1307471723138212117",
       "name": "D2",
       "namespace": "clanguml::t20019",
@@ -290,6 +299,26 @@ void tmain()
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "1038853547136467401",
+            "participant_id": "381327373934972004"
+          },
+          "name": "impl()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 19,
+            "file": "t20019.cc",
+            "line": 9,
+            "translation_unit": "t20019.cc"
+          },
+          "to": {
+            "activity_id": "603969604599968603",
+            "participant_id": "1282259011856139592"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "375304196268652861",
@@ -309,6 +338,26 @@ void tmain()
             "participant_id": "1659477498076328530"
           },
           "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1918672956676175365",
+            "participant_id": "1659477498076328530"
+          },
+          "name": "impl()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 19,
+            "file": "t20019.cc",
+            "line": 9,
+            "translation_unit": "t20019.cc"
+          },
+          "to": {
+            "activity_id": "861400435979772695",
+            "participant_id": "1307471723138212117"
+          },
+          "type": "message"
         }
       ],
       "start_from": {
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index a1468b6b..fe83b99e 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="fpa4mq99siiym" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1cg2cw092xiew" 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(#fpa4mq99siiym)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpa4mq99siiym)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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(#fpa4mq99siiym)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpa4mq99siiym)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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(#fpa4mq99siiym)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpa4mq99siiym)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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(#fpa4mq99siiym)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpa4mq99siiym)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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(#fpa4mq99siiym)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpa4mq99siiym)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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(#fpa4mq99siiym)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1cg2cw092xiew)" 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(#fpa4mq99siiym)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fpa4mq99siiym)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1cg2cw092xiew)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 26b80d87..891e9311 100644
--- a/docs/test_cases/t20020.md
+++ b/docs/test_cases/t20020.md
@@ -119,6 +119,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20020::tmain()",
       "id": "432124388562400664",
       "name": "tmain",
       "namespace": "clanguml::t20020",
@@ -134,6 +135,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a1()",
+          "full_name": "clanguml::t20020::A::a1()",
           "id": "43928675765534701",
           "name": "a1",
           "namespace": "",
@@ -147,6 +149,7 @@ int tmain()
         },
         {
           "display_name": "a5()",
+          "full_name": "clanguml::t20020::A::a5()",
           "id": "1613457246223182826",
           "name": "a5",
           "namespace": "",
@@ -160,6 +163,7 @@ int tmain()
         },
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20020::A::a2()",
           "id": "1289745252290688140",
           "name": "a2",
           "namespace": "",
@@ -173,6 +177,7 @@ int tmain()
         },
         {
           "display_name": "a3()",
+          "full_name": "clanguml::t20020::A::a3()",
           "id": "1983660679554669898",
           "name": "a3",
           "namespace": "",
@@ -186,6 +191,7 @@ int tmain()
         },
         {
           "display_name": "a4()",
+          "full_name": "clanguml::t20020::A::a4()",
           "id": "20573198999978866",
           "name": "a4",
           "namespace": "",
@@ -199,6 +205,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20020::A",
       "id": "208941846648931609",
       "name": "A",
       "namespace": "clanguml::t20020",
@@ -214,6 +221,7 @@ int tmain()
       "activities": [
         {
           "display_name": "c3(int)",
+          "full_name": "clanguml::t20020::C::c3(int)",
           "id": "1303438784842196201",
           "name": "c3",
           "namespace": "",
@@ -227,6 +235,7 @@ int tmain()
         },
         {
           "display_name": "c1() const",
+          "full_name": "clanguml::t20020::C::c1() const",
           "id": "1473521613404783653",
           "name": "c1",
           "namespace": "",
@@ -240,6 +249,7 @@ int tmain()
         },
         {
           "display_name": "c2() const",
+          "full_name": "clanguml::t20020::C::c2() const",
           "id": "1789116382725485914",
           "name": "c2",
           "namespace": "",
@@ -253,6 +263,7 @@ int tmain()
         },
         {
           "display_name": "log() const",
+          "full_name": "clanguml::t20020::C::log() const",
           "id": "635780525021572670",
           "name": "log",
           "namespace": "",
@@ -266,6 +277,7 @@ int tmain()
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20020::C",
       "id": "1562462306909405383",
       "name": "C",
       "namespace": "clanguml::t20020",
@@ -281,6 +293,7 @@ int tmain()
       "activities": [
         {
           "display_name": "b1()",
+          "full_name": "clanguml::t20020::B::b1()",
           "id": "542196582335607343",
           "name": "b1",
           "namespace": "",
@@ -294,6 +307,7 @@ int tmain()
         },
         {
           "display_name": "b2()",
+          "full_name": "clanguml::t20020::B::b2()",
           "id": "505760236964179187",
           "name": "b2",
           "namespace": "",
@@ -307,6 +321,7 @@ int tmain()
         },
         {
           "display_name": "log()",
+          "full_name": "clanguml::t20020::B::log()",
           "id": "1436250788704205026",
           "name": "log",
           "namespace": "",
@@ -320,6 +335,7 @@ int tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20020::B",
       "id": "1342563483612170412",
       "name": "B",
       "namespace": "clanguml::t20020",
@@ -335,6 +351,7 @@ int tmain()
       "activities": [
         {
           "display_name": "d1(int,int)",
+          "full_name": "clanguml::t20020::D<int>::d1(int,int)",
           "id": "1780002010052842766",
           "name": "d1",
           "namespace": "",
@@ -348,6 +365,7 @@ int tmain()
         }
       ],
       "display_name": "D<int>",
+      "full_name": "clanguml::t20020::D<int>",
       "id": "1605914310746811866",
       "name": "D",
       "namespace": "clanguml::t20020",
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index 584640eb..2ec208d6 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="879px" preserveAspectRatio="none" style="width:385px;height:879px;" version="1.1" viewBox="0 0 385 879" width="385px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f89cds97o6uvc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fb1iam40gi3r4" 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,82 +9,82 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="115.5625"/>
     <rect fill="#FFFFFF" height="250.7969" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="160.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
     <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="271.5" x="23" y="316.2266"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="291.5" x="13" y="411.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="839.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="329.5" x2="329.5" y1="38.2969" y2="839.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f89cds97o6uvc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L40" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L40" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" 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(#f89cds97o6uvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="858.6826">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f89cds97o6uvc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" 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(#f89cds97o6uvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="858.6826">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f89cds97o6uvc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" 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(#f89cds97o6uvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="858.6826">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f89cds97o6uvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f89cds97o6uvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="256.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="263.5" y="858.6826">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f89cds97o6uvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="22.9951">D&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f89cds97o6uvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
+      <rect fill="#FEFECE" filter="url(#fb1iam40gi3r4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="294.5" y="838.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="301.5" y="858.6826">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f89cds97o6uvc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="781.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="138.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="207.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="339.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="434.625"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="251.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="568.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="629.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="698.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="382.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="265.5" y="484.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fb1iam40gi3r4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="324.5" y="800.6875"/>
     <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="401.3281" style="stroke: #000000; stroke-width: 2.0;" width="291.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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L50" 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>
@@ -92,7 +92,7 @@
     <polygon fill="#A80036" points="82,103.5625,72,107.5625,82,111.5625,78,107.5625" 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="107.5625" y2="107.5625"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="116.5625" y2="116.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,134.6953,126,138.6953,116,142.6953,120,138.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="138.6953" y2="138.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="133.6294">a5()</text>
@@ -103,7 +103,7 @@
     <path d="M23,169.6953 L87,169.6953 L87,176.6953 L77,186.6953 L23,186.6953 L23,169.6953 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="23" y="169.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="182.7622">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,203.9609,126,207.9609,116,211.9609,120,207.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="207.9609" y2="207.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="202.895">[</text>
@@ -112,7 +112,7 @@
     </a>
     <polygon fill="#A80036" points="82,217.9609,72,221.9609,82,225.9609,78,221.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="132" y1="221.9609" y2="221.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,247.0938,163.5,251.0938,153.5,255.0938,157.5,251.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="251.0938" y2="251.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="246.0278">[</text>
@@ -121,7 +121,7 @@
     </a>
     <polygon fill="#A80036" points="82,261.0938,72,265.0938,82,269.0938,78,265.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="169.5" y1="265.0938" y2="265.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,290.2266,263.5,294.2266,253.5,298.2266,257.5,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="294.2266" y2="294.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="289.1606">b1()</text>
@@ -129,7 +129,7 @@
     <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="269.5" y1="308.2266" y2="308.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="294.5" y1="317.2266" y2="317.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,335.3594,126,339.3594,116,343.3594,120,339.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="339.3594" y2="339.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="334.2935">[</text>
@@ -138,7 +138,7 @@
     </a>
     <polygon fill="#A80036" points="82,349.3594,72,353.3594,82,357.3594,78,353.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="132" y1="353.3594" y2="353.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,378.4922,263.5,382.4922,253.5,386.4922,257.5,382.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="382.4922" y2="382.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="377.4263">b2()</text>
@@ -146,14 +146,14 @@
     <polygon fill="#A80036" points="82,392.4922,72,396.4922,82,400.4922,78,396.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="269.5" y1="396.4922" y2="396.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="304.5" y1="412.4922" y2="412.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,430.625,126,434.625,116,438.625,120,434.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="434.625" y2="434.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="429.5591">a4()</text>
     </a>
     <polygon fill="#A80036" points="82,444.625,72,448.625,82,452.625,78,448.625" 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="448.625" y2="448.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="253.5,480.7578,263.5,484.7578,253.5,488.7578,257.5,484.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="259.5" y1="484.7578" y2="484.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="479.6919">log()</text>
@@ -161,7 +161,7 @@
     <path d="M23,529.7578 L87,529.7578 L87,536.7578 L77,546.7578 L23,546.7578 L23,529.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="262.5" x="23" y="529.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="542.8247">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,564.0234,163.5,568.0234,153.5,572.0234,157.5,568.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="568.0234" y2="568.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="78" y="562.9575">c1() const</text>
@@ -169,7 +169,7 @@
     <path d="M146.5,583.0234 L210.5,583.0234 L210.5,590.0234 L200.5,600.0234 L146.5,600.0234 L146.5,583.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="129" x="146.5" y="583.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="596.0903">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="616.2891" y2="616.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="616.2891" y2="629.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="629.2891" y2="629.2891"/>
@@ -182,7 +182,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="653.2891" y2="666.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="666.2891" y2="666.2891"/>
     <polygon fill="#A80036" points="185.5,662.2891,175.5,666.2891,185.5,670.2891,181.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="690.4219" y2="690.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="690.4219" y2="703.4219"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="703.4219" y2="703.4219"/>
@@ -192,7 +192,7 @@
     <path d="M23,762.4219 L87,762.4219 L87,769.4219 L77,779.4219 L23,779.4219 L23,762.4219 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="351.5" x="23" y="762.4219"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="775.4888">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20020/t20020.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="312.5,796.6875,322.5,800.6875,312.5,804.6875,316.5,800.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="318.5" y1="800.6875" y2="800.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="795.6216">d1(int,int)</text>
diff --git a/docs/test_cases/t20021.md b/docs/test_cases/t20021.md
index aaa507b9..64a335e5 100644
--- a/docs/test_cases/t20021.md
+++ b/docs/test_cases/t20021.md
@@ -86,6 +86,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20021::tmain()",
       "id": "1682631020380557915",
       "name": "tmain",
       "namespace": "clanguml::t20021",
@@ -101,6 +102,7 @@ int tmain()
       "activities": [
         {
           "display_name": "c4()",
+          "full_name": "clanguml::t20021::C::c4()",
           "id": "124927877622321176",
           "name": "c4",
           "namespace": "",
@@ -114,6 +116,7 @@ int tmain()
         },
         {
           "display_name": "c5()",
+          "full_name": "clanguml::t20021::C::c5()",
           "id": "1325720714179808628",
           "name": "c5",
           "namespace": "",
@@ -127,6 +130,7 @@ int tmain()
         },
         {
           "display_name": "c1()",
+          "full_name": "clanguml::t20021::C::c1()",
           "id": "2143764740072323303",
           "name": "c1",
           "namespace": "",
@@ -140,6 +144,7 @@ int tmain()
         },
         {
           "display_name": "c2()",
+          "full_name": "clanguml::t20021::C::c2()",
           "id": "1707693479408501017",
           "name": "c2",
           "namespace": "",
@@ -153,6 +158,7 @@ int tmain()
         },
         {
           "display_name": "c3()",
+          "full_name": "clanguml::t20021::C::c3()",
           "id": "1302892753246800390",
           "name": "c3",
           "namespace": "",
@@ -166,6 +172,7 @@ int tmain()
         },
         {
           "display_name": "contents()",
+          "full_name": "clanguml::t20021::C::contents()",
           "id": "814405216385697964",
           "name": "contents",
           "namespace": "",
@@ -179,6 +186,7 @@ int tmain()
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20021::C",
       "id": "451128000259357438",
       "name": "C",
       "namespace": "clanguml::t20021",
@@ -194,6 +202,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a3()",
+          "full_name": "clanguml::t20021::A::a3()",
           "id": "1867955233624891190",
           "name": "a3",
           "namespace": "",
@@ -207,6 +216,7 @@ int tmain()
         },
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20021::A::a2()",
           "id": "1139294797758415018",
           "name": "a2",
           "namespace": "",
@@ -220,6 +230,7 @@ int tmain()
         },
         {
           "display_name": "a1()",
+          "full_name": "clanguml::t20021::A::a1()",
           "id": "1659488549696810992",
           "name": "a1",
           "namespace": "",
@@ -233,6 +244,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20021::A",
       "id": "1280483607329510730",
       "name": "A",
       "namespace": "clanguml::t20021",
@@ -248,6 +260,7 @@ int tmain()
       "activities": [
         {
           "display_name": "b2() const",
+          "full_name": "clanguml::t20021::B::b2() const",
           "id": "1561040999276563077",
           "name": "b2",
           "namespace": "",
@@ -261,6 +274,7 @@ int tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20021::B",
       "id": "1849696080443395393",
       "name": "B",
       "namespace": "clanguml::t20021",
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index fca3ac8e..b739f2b0 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="fjl4wsxe34m62" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1xkzlzggfv650" 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(#fjl4wsxe34m62)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl4wsxe34m62)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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(#fjl4wsxe34m62)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl4wsxe34m62)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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(#fjl4wsxe34m62)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl4wsxe34m62)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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(#fjl4wsxe34m62)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjl4wsxe34m62)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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(#fjl4wsxe34m62)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1xkzlzggfv650)" 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(#fjl4wsxe34m62)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fjl4wsxe34m62)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1xkzlzggfv650)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="65" x="88" y="552.9575">b2() const</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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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="65" x="88" y="677.356">b2() const</text>
diff --git a/docs/test_cases/t20022.md b/docs/test_cases/t20022.md
index 3a5b201f..f359bdc8 100644
--- a/docs/test_cases/t20022.md
+++ b/docs/test_cases/t20022.md
@@ -66,6 +66,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20022::tmain()",
       "id": "1374011101998494743",
       "name": "tmain",
       "namespace": "clanguml::t20022",
@@ -81,6 +82,7 @@ int tmain()
       "activities": [
         {
           "display_name": "A(std::unique_ptr<B>)",
+          "full_name": "clanguml::t20022::A::A(std::unique_ptr<B>)",
           "id": "1226569306557207632",
           "name": "A",
           "namespace": "",
@@ -94,6 +96,7 @@ int tmain()
         },
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20022::A::a()",
           "id": "1158824701633811441",
           "name": "a",
           "namespace": "",
@@ -107,6 +110,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20022::A",
       "id": "1535467498096081224",
       "name": "A",
       "namespace": "clanguml::t20022",
@@ -122,6 +126,7 @@ int tmain()
       "activities": [
         {
           "display_name": "b()",
+          "full_name": "clanguml::t20022::B::b()",
           "id": "2114222968575993291",
           "name": "b",
           "namespace": "",
@@ -135,6 +140,7 @@ int tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20022::B",
       "id": "1316821731069034940",
       "name": "B",
       "namespace": "clanguml::t20022",
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index b400c21a..cae87180 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="245px" preserveAspectRatio="none" style="width:254px;height:245px;" version="1.1" viewBox="0 0 254 245" width="254px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1061mpzr9i5rp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ostdbz6exfjp" 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(#f1061mpzr9i5rp)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1061mpzr9i5rp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1061mpzr9i5rp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1061mpzr9i5rp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="205.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="185.5" x2="185.5" y1="38.2969" y2="205.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="233" x2="233" y1="38.2969" y2="205.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1061mpzr9i5rp)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ostdbz6exfjp)" 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(#f1061mpzr9i5rp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1ostdbz6exfjp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="224.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1061mpzr9i5rp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ostdbz6exfjp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1061mpzr9i5rp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1ostdbz6exfjp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="172.5" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="179.5" y="224.6904">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1061mpzr9i5rp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ostdbz6exfjp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1061mpzr9i5rp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1ostdbz6exfjp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="219" y="204.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="226" y="224.6904">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1061mpzr9i5rp)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1061mpzr9i5rp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1061mpzr9i5rp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1061mpzr9i5rp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="139.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="181" y="128.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ostdbz6exfjp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228" y="157.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="169,65.4297,179,69.4297,169,73.4297,173,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="53" y="64.3638">A(std::unique_ptr</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="163" y="64.3638">)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="169,124.5625,179,128.5625,169,132.5625,173,128.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="175" y1="128.5625" y2="128.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="123.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="216,153.6953,226,157.6953,216,161.6953,220,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="191" x2="222" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="198" y="152.6294">b()</text>
diff --git a/docs/test_cases/t20023.md b/docs/test_cases/t20023.md
index badfc94d..bdcac722 100644
--- a/docs/test_cases/t20023.md
+++ b/docs/test_cases/t20023.md
@@ -69,6 +69,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20023::tmain()",
       "id": "761552264135157511",
       "name": "tmain",
       "namespace": "clanguml::t20023",
@@ -84,6 +85,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20023::A::a()",
           "id": "530651320277188697",
           "name": "a",
           "namespace": "",
@@ -97,6 +99,7 @@ int tmain()
         },
         {
           "display_name": "a1()",
+          "full_name": "clanguml::t20023::A::a1()",
           "id": "94135113932519208",
           "name": "a1",
           "namespace": "",
@@ -110,6 +113,7 @@ int tmain()
         },
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20023::A::a2()",
           "id": "2060438178899014465",
           "name": "a2",
           "namespace": "",
@@ -123,6 +127,7 @@ int tmain()
         },
         {
           "display_name": "a3()",
+          "full_name": "clanguml::t20023::A::a3()",
           "id": "1776927259621603017",
           "name": "a3",
           "namespace": "",
@@ -136,6 +141,7 @@ int tmain()
         },
         {
           "display_name": "a4()",
+          "full_name": "clanguml::t20023::A::a4()",
           "id": "1082587698374248813",
           "name": "a4",
           "namespace": "",
@@ -149,6 +155,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20023::A",
       "id": "750638294800359616",
       "name": "A",
       "namespace": "clanguml::t20023",
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index d655ec9c..50295a7a 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="f44zrbrdtohpe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fjjca9298l7x4" 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(#f44zrbrdtohpe)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f44zrbrdtohpe)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjjca9298l7x4)" 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(#f44zrbrdtohpe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#fjjca9298l7x4)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f44zrbrdtohpe)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjjca9298l7x4)" 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(#f44zrbrdtohpe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#fjjca9298l7x4)" 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(#f44zrbrdtohpe)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f44zrbrdtohpe)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fjjca9298l7x4)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 83fdb4c9..165f4a38 100644
--- a/docs/test_cases/t20024.md
+++ b/docs/test_cases/t20024.md
@@ -94,6 +94,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20024::tmain()",
       "id": "1919714441225983014",
       "name": "tmain",
       "namespace": "clanguml::t20024",
@@ -109,6 +110,7 @@ int tmain()
       "activities": [
         {
           "display_name": "select(enum_a)",
+          "full_name": "clanguml::t20024::A::select(enum_a)",
           "id": "1200587047701031901",
           "name": "select",
           "namespace": "",
@@ -122,6 +124,7 @@ int tmain()
         },
         {
           "display_name": "a0()",
+          "full_name": "clanguml::t20024::A::a0()",
           "id": "1859614580641799156",
           "name": "a0",
           "namespace": "",
@@ -135,6 +138,7 @@ int tmain()
         },
         {
           "display_name": "a1()",
+          "full_name": "clanguml::t20024::A::a1()",
           "id": "501598940454911460",
           "name": "a1",
           "namespace": "",
@@ -148,6 +152,7 @@ int tmain()
         },
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20024::A::a2()",
           "id": "1698866541173753340",
           "name": "a2",
           "namespace": "",
@@ -161,6 +166,7 @@ int tmain()
         },
         {
           "display_name": "a3()",
+          "full_name": "clanguml::t20024::A::a3()",
           "id": "490376438551958259",
           "name": "a3",
           "namespace": "",
@@ -174,6 +180,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20024::A",
       "id": "40786919835708828",
       "name": "A",
       "namespace": "clanguml::t20024",
@@ -189,6 +196,7 @@ int tmain()
       "activities": [
         {
           "display_name": "select(colors)",
+          "full_name": "clanguml::t20024::B::select(colors)",
           "id": "286108218156977422",
           "name": "select",
           "namespace": "",
@@ -202,6 +210,7 @@ int tmain()
         },
         {
           "display_name": "red()",
+          "full_name": "clanguml::t20024::B::red()",
           "id": "112014563206084467",
           "name": "red",
           "namespace": "",
@@ -215,6 +224,7 @@ int tmain()
         },
         {
           "display_name": "orange()",
+          "full_name": "clanguml::t20024::B::orange()",
           "id": "2222823236498505185",
           "name": "orange",
           "namespace": "",
@@ -228,6 +238,7 @@ int tmain()
         },
         {
           "display_name": "green()",
+          "full_name": "clanguml::t20024::B::green()",
           "id": "519021723720658376",
           "name": "green",
           "namespace": "",
@@ -241,6 +252,7 @@ int tmain()
         },
         {
           "display_name": "grey()",
+          "full_name": "clanguml::t20024::B::grey()",
           "id": "1813557671878544737",
           "name": "grey",
           "namespace": "",
@@ -254,6 +266,7 @@ int tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20024::B",
       "id": "933287014626440872",
       "name": "B",
       "namespace": "clanguml::t20024",
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index ae2b817a..5e530bd7 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="f19gc28fws7pno" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1r9i30mq1tzqa" 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(#f19gc28fws7pno)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" 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(#f19gc28fws7pno)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19gc28fws7pno)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1r9i30mq1tzqa)" 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(#f19gc28fws7pno)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f1r9i30mq1tzqa)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19gc28fws7pno)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1r9i30mq1tzqa)" 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(#f19gc28fws7pno)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f1r9i30mq1tzqa)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19gc28fws7pno)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1r9i30mq1tzqa)" 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(#f19gc28fws7pno)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f1r9i30mq1tzqa)" 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(#f19gc28fws7pno)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f19gc28fws7pno)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f1r9i30mq1tzqa)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 fccaf773..58d9263c 100644
--- a/docs/test_cases/t20025.md
+++ b/docs/test_cases/t20025.md
@@ -74,6 +74,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20025::tmain()",
       "id": "1268545806896171690",
       "name": "tmain",
       "namespace": "clanguml::t20025",
@@ -89,6 +90,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20025::A::a()",
           "id": "1119830104994271584",
           "name": "a",
           "namespace": "",
@@ -102,6 +104,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20025::A",
       "id": "2144852170258286289",
       "name": "A",
       "namespace": "clanguml::t20025",
@@ -115,6 +118,7 @@ int tmain()
     },
     {
       "display_name": "add(int,int)",
+      "full_name": "clanguml::t20025::add(int,int)",
       "id": "228843323046630374",
       "name": "add",
       "namespace": "clanguml::t20025",
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index 572ac89f..7c246eac 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="169px" preserveAspectRatio="none" style="width:220px;height:169px;" version="1.1" viewBox="0 0 220 169" width="220px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fph7jgd237x6w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fraipvn6aluwi" 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(#fph7jgd237x6w)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fph7jgd237x6w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fph7jgd237x6w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fraipvn6aluwi)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fraipvn6aluwi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fraipvn6aluwi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="129.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="129.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="129.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fph7jgd237x6w)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fraipvn6aluwi)" 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(#fph7jgd237x6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="128.4297"/>
+      <rect fill="#FEFECE" filter="url(#fraipvn6aluwi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="128.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="148.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fph7jgd237x6w)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fraipvn6aluwi)" 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(#fph7jgd237x6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="128.4297"/>
+      <rect fill="#FEFECE" filter="url(#fraipvn6aluwi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="128.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="148.4248">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fph7jgd237x6w)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fraipvn6aluwi)" 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(#fph7jgd237x6w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="128.4297"/>
+      <rect fill="#FEFECE" filter="url(#fraipvn6aluwi)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="128.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="148.4248">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fph7jgd237x6w)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fph7jgd237x6w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fph7jgd237x6w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fraipvn6aluwi)" height="63.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fraipvn6aluwi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fraipvn6aluwi)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="97.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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>
     <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="96.5" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="150,93.4297,160,97.4297,150,101.4297,154,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="97.4297" y2="97.4297"/>
     </a>
diff --git a/docs/test_cases/t20026.md b/docs/test_cases/t20026.md
index dcb559c4..8f0091ce 100644
--- a/docs/test_cases/t20026.md
+++ b/docs/test_cases/t20026.md
@@ -54,6 +54,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20026::tmain()",
       "id": "2268697350307997040",
       "name": "tmain",
       "namespace": "clanguml::t20026",
@@ -69,6 +70,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20026::A::a()",
           "id": "600590770418147864",
           "name": "a",
           "namespace": "",
@@ -82,6 +84,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20026::A",
       "id": "1962121823853291899",
       "name": "A",
       "namespace": "clanguml::t20026",
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index 0fadbd52..d4b71277 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="f80521r7t0skd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ftm8lf4gul4rp" 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(#f80521r7t0skd)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f80521r7t0skd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#ftm8lf4gul4rp)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#ftm8lf4gul4rp)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f80521r7t0skd)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftm8lf4gul4rp)" 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(#f80521r7t0skd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#ftm8lf4gul4rp)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f80521r7t0skd)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftm8lf4gul4rp)" 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(#f80521r7t0skd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#ftm8lf4gul4rp)" 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(#f80521r7t0skd)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f80521r7t0skd)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#ftm8lf4gul4rp)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#ftm8lf4gul4rp)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 debe9624..62a2af3e 100644
--- a/docs/test_cases/t20027.md
+++ b/docs/test_cases/t20027.md
@@ -53,6 +53,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20027::tmain()",
       "id": "1581009482994430286",
       "name": "tmain",
       "namespace": "clanguml::t20027",
@@ -68,6 +69,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20027::A::a()",
           "id": "910514967786202717",
           "name": "a",
           "namespace": "",
@@ -81,6 +83,7 @@ void tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20027::A",
       "id": "583525629936262089",
       "name": "A",
       "namespace": "clanguml::t20027",
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index f5e8c321..3fd15dee 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="f1fmvf0rmf3lqm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fe0hrjvxrhoek" 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(#f1fmvf0rmf3lqm)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmvf0rmf3lqm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fe0hrjvxrhoek)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fe0hrjvxrhoek)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fmvf0rmf3lqm)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe0hrjvxrhoek)" 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(#f1fmvf0rmf3lqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fe0hrjvxrhoek)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fmvf0rmf3lqm)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe0hrjvxrhoek)" 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(#f1fmvf0rmf3lqm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fe0hrjvxrhoek)" 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(#f1fmvf0rmf3lqm)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmvf0rmf3lqm)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fe0hrjvxrhoek)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fe0hrjvxrhoek)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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 9f698cdd..3d05d652 100644
--- a/docs/test_cases/t20028.md
+++ b/docs/test_cases/t20028.md
@@ -63,6 +63,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20028::tmain()",
       "id": "1347206662193933194",
       "name": "tmain",
       "namespace": "clanguml::t20028",
@@ -78,6 +79,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20028::A::a()",
           "id": "666210834901940781",
           "name": "a",
           "namespace": "",
@@ -91,6 +93,7 @@ int tmain()
         },
         {
           "display_name": "b()",
+          "full_name": "clanguml::t20028::A::b()",
           "id": "793793464184037795",
           "name": "b",
           "namespace": "",
@@ -104,6 +107,7 @@ int tmain()
         },
         {
           "display_name": "c()",
+          "full_name": "clanguml::t20028::A::c()",
           "id": "1582152567698110078",
           "name": "c",
           "namespace": "",
@@ -117,6 +121,7 @@ int tmain()
         },
         {
           "display_name": "d()",
+          "full_name": "clanguml::t20028::A::d()",
           "id": "1178268687951492696",
           "name": "d",
           "namespace": "",
@@ -130,6 +135,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20028::A",
       "id": "2073479923903128898",
       "name": "A",
       "namespace": "clanguml::t20028",
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index 244fe608..cd54101c 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:150px;height:304px;" version="1.1" viewBox="0 0 150 304" width="150px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1piywc873117x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1xguluikecm1x" 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,36 +9,36 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="125.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="125.5" 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="114.5" x2="114.5" y1="38.2969" y2="263.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1piywc873117x)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xguluikecm1x)" 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(#f1piywc873117x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1xguluikecm1x)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1piywc873117x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1xguluikecm1x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1piywc873117x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1xguluikecm1x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="101.5" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="108.5" y="282.9561">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1piywc873117x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1xguluikecm1x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" 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="125.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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,89.5625,108,93.5625,98,97.5625,102,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="88.4966">[</text>
@@ -47,14 +47,14 @@
     </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="114" y1="107.5625" y2="107.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,132.6953,108,136.6953,98,140.6953,102,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" 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="114" y1="150.6953" y2="150.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,175.8281,108,179.8281,98,183.8281,102,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" 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>
@@ -62,7 +62,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="114" y1="193.8281" y2="193.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="138.5" y1="202.8281" y2="202.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,220.9609,108,224.9609,98,228.9609,102,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="104" 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 5adbaa45..de6b7136 100644
--- a/docs/test_cases/t20029.md
+++ b/docs/test_cases/t20029.md
@@ -116,6 +116,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20029::tmain()",
       "id": "2091374738808319642",
       "name": "tmain",
       "namespace": "clanguml::t20029",
@@ -131,6 +132,7 @@ int tmain()
       "activities": [
         {
           "display_name": "send(std::string &&)",
+          "full_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::send(std::string &&)",
           "id": "2026763864005979273",
           "name": "send",
           "namespace": "",
@@ -144,6 +146,7 @@ int tmain()
         },
         {
           "display_name": "encode(std::string &&)",
+          "full_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::encode(std::string &&)",
           "id": "1468258269466480773",
           "name": "encode",
           "namespace": "",
@@ -157,6 +160,7 @@ int tmain()
         }
       ],
       "display_name": "Encoder<Retrier<ConnectionPool>>",
+      "full_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>",
       "id": "1673261195873192383",
       "name": "Encoder",
       "namespace": "clanguml::t20029",
@@ -172,6 +176,7 @@ int tmain()
       "activities": [
         {
           "display_name": "send(std::string &&)",
+          "full_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>::send(std::string &&)",
           "id": "30515971485361302",
           "name": "send",
           "namespace": "",
@@ -185,6 +190,7 @@ int tmain()
         }
       ],
       "display_name": "Retrier<ConnectionPool>",
+      "full_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>",
       "id": "658058855590948094",
       "name": "Retrier",
       "namespace": "clanguml::t20029",
@@ -200,6 +206,7 @@ int tmain()
       "activities": [
         {
           "display_name": "connect()",
+          "full_name": "clanguml::t20029::ConnectionPool::connect()",
           "id": "940428568182104530",
           "name": "connect",
           "namespace": "",
@@ -213,6 +220,7 @@ int tmain()
         },
         {
           "display_name": "send(const std::string &)",
+          "full_name": "clanguml::t20029::ConnectionPool::send(const std::string &)",
           "id": "972625940114169157",
           "name": "send",
           "namespace": "",
@@ -226,6 +234,7 @@ int tmain()
         }
       ],
       "display_name": "ConnectionPool",
+      "full_name": "clanguml::t20029::ConnectionPool",
       "id": "1896406205097618937",
       "name": "ConnectionPool",
       "namespace": "clanguml::t20029",
@@ -239,6 +248,7 @@ int tmain()
     },
     {
       "display_name": "encode_b64(std::string &&)",
+      "full_name": "clanguml::t20029::encode_b64(std::string &&)",
       "id": "1362646431260879440",
       "name": "encode_b64",
       "namespace": "clanguml::t20029",
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index a42f248b..4ed69218 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="740px" preserveAspectRatio="none" style="width:1064px;height:740px;" version="1.1" viewBox="0 0 1064 740" width="1064px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fchnqqlvm35x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ac08djts5zp5" 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,69 +9,69 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="460.7266" style="stroke: #000000; stroke-width: 2.0;" width="993" x="60" y="222.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="426" y="550.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="436" y="574.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="113" x2="113" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="296" x2="296" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="545" x2="545" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="745" x2="745" y1="38.2969" y2="700.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="926" x2="926" y1="38.2969" y2="700.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="80" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="87" y="719.6826">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="156" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="163" y="719.6826">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L25" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L25" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="446" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="453" y="719.6826">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L43" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L43" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="22.9951">ConnectionPool</text>
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="681" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="688" y="719.6826">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#fchnqqlvm35x)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="699.6875"/>
+      <rect fill="#FEFECE" filter="url(#f1ac08djts5zp5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="819" y="699.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="826" y="719.6826">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fchnqqlvm35x)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
-    <path d="M8,53.2969 L8,93.2969 L215,93.2969 L215,63.2969 L205,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#fchnqqlvm35x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="642.3906" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="108" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="383.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="291" y="285.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="296" y="391.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="173.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="540" y="481.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="123.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="740" y="612.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1ac08djts5zp5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="921" y="410.8906"/>
+    <path d="M8,53.2969 L8,93.2969 L215,93.2969 L215,63.2969 L205,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f1ac08djts5zp5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M205,53.2969 L205,63.2969 L215,63.2969 L205,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="14" y="70.3638">Establish connection to the</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="186" x="14" y="85.4966">remote server synchronously</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L64" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L64" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="728,119.6953,738,123.6953,728,127.6953,732,123.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="734" y1="123.6953" y2="123.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="125" y="118.6294">connect()</text>
     </a>
-    <path d="M17,166.6953 L17,206.6953 L205,206.6953 L205,176.6953 L195,166.6953 L17,166.6953 " fill="#FBFB77" filter="url(#fchnqqlvm35x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M17,166.6953 L17,206.6953 L205,206.6953 L205,176.6953 L195,166.6953 L17,166.6953 " fill="#FBFB77" filter="url(#f1ac08djts5zp5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M195,166.6953 L195,176.6953 L205,176.6953 L195,166.6953 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="23" y="183.7622">Repeat for each line in the</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="23" y="198.895">input stream</text>
@@ -81,26 +81,26 @@
     <path d="M70,247.0938 L134,247.0938 L134,254.0938 L124,264.0938 L70,264.0938 L70,247.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="429.5938" style="stroke: #000000; stroke-width: 2.0;" width="973" x="70" y="247.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85" y="260.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="279,281.3594,289,285.3594,279,289.3594,283,285.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="118" x2="285" y1="285.3594" y2="285.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="125" y="280.2935">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="131" y="280.2935">send(std::string &amp;&amp;)</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="262" y="280.2935">]</text>
     </a>
-    <path d="M197,298.3594 L197,353.3594 L391,353.3594 L391,308.3594 L381,298.3594 L197,298.3594 " fill="#FBFB77" filter="url(#fchnqqlvm35x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M197,298.3594 L197,353.3594 L391,353.3594 L391,308.3594 L381,298.3594 L197,298.3594 " fill="#FBFB77" filter="url(#f1ac08djts5zp5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M381,298.3594 L381,308.3594 L391,308.3594 L381,298.3594 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="173" x="203" y="315.4263">Encode the message using</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="172" x="203" y="330.5591">Base64 encoding and pass</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="117" x="203" y="345.6919">it to the next layer</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="348" y1="378.8906" y2="378.8906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="348" x2="348" y1="378.8906" y2="391.8906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="307" x2="348" y1="391.8906" y2="391.8906"/>
       <polygon fill="#A80036" points="317,387.8906,307,391.8906,317,395.8906,313,391.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="313" y="373.8247">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="909,406.8906,919,410.8906,909,414.8906,913,410.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="306" x2="915" y1="410.8906" y2="410.8906"/>
     </a>
@@ -110,12 +110,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="348" x2="348" y1="443.8906" y2="456.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="348" y1="456.8906" y2="456.8906"/>
     <polygon fill="#A80036" points="311,452.8906,301,456.8906,311,460.8906,307,456.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="528,477.0234,538,481.0234,528,485.0234,532,481.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="534" y1="481.0234" y2="481.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="308" y="475.9575">send(std::string &amp;&amp;)</text>
     </a>
-    <path d="M440,494.0234 L440,534.0234 L646,534.0234 L646,504.0234 L636,494.0234 L440,494.0234 " fill="#FBFB77" filter="url(#fchnqqlvm35x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M440,494.0234 L440,534.0234 L646,534.0234 L646,504.0234 L636,494.0234 L440,494.0234 " fill="#FBFB77" filter="url(#f1ac08djts5zp5)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M636,494.0234 L636,504.0234 L646,504.0234 L636,494.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="185" x="446" y="511.0903">Repeat until send() succeeds</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="167" x="446" y="526.2231">or retry count is exceeded</text>
@@ -125,7 +125,7 @@
     <path d="M436,574.4219 L500,574.4219 L500,581.4219 L490,591.4219 L436,591.4219 L436,574.4219 " 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="436" y="574.4219"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="451" y="587.4888">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20029/t20029.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="728,608.6875,738,612.6875,728,616.6875,732,612.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="550" x2="734" y1="612.6875" y2="612.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="557" y="607.6216">[</text>
diff --git a/docs/test_cases/t20030.md b/docs/test_cases/t20030.md
index 1046ed4f..462dc69a 100644
--- a/docs/test_cases/t20030.md
+++ b/docs/test_cases/t20030.md
@@ -81,6 +81,7 @@ int tmain(bool f, int a)
   "participants": [
     {
       "display_name": "tmain(int)",
+      "full_name": "clanguml::t20030::tmain(int)",
       "id": "1264643561983920529",
       "name": "tmain",
       "namespace": "clanguml::t20030",
@@ -94,6 +95,7 @@ int tmain(bool f, int a)
     },
     {
       "display_name": "magic()",
+      "full_name": "clanguml::t20030::magic()",
       "id": "1038740565367213967",
       "name": "magic",
       "namespace": "clanguml::t20030",
@@ -109,6 +111,7 @@ int tmain(bool f, int a)
       "activities": [
         {
           "display_name": "A(int)",
+          "full_name": "clanguml::t20030::A::A(int)",
           "id": "2192298168642377389",
           "name": "A",
           "namespace": "",
@@ -122,6 +125,7 @@ int tmain(bool f, int a)
         },
         {
           "display_name": "operator+=(int)",
+          "full_name": "clanguml::t20030::A::operator+=(int)",
           "id": "2032167997122548080",
           "name": "operator+=",
           "namespace": "",
@@ -135,6 +139,7 @@ int tmain(bool f, int a)
         },
         {
           "display_name": "add(int)",
+          "full_name": "clanguml::t20030::A::add(int)",
           "id": "2174827432067616124",
           "name": "add",
           "namespace": "",
@@ -148,6 +153,7 @@ int tmain(bool f, int a)
         },
         {
           "display_name": "A()",
+          "full_name": "clanguml::t20030::A::A()",
           "id": "32184916294885915",
           "name": "A",
           "namespace": "",
@@ -161,6 +167,7 @@ int tmain(bool f, int a)
         },
         {
           "display_name": "create()",
+          "full_name": "clanguml::t20030::A::create()",
           "id": "890578100069139188",
           "name": "create",
           "namespace": "",
@@ -174,6 +181,7 @@ int tmain(bool f, int a)
         },
         {
           "display_name": "operator=(const A &)",
+          "full_name": "clanguml::t20030::A::operator=(const A &)",
           "id": "1796303685088700396",
           "name": "operator=",
           "namespace": "",
@@ -187,6 +195,7 @@ int tmain(bool f, int a)
         },
         {
           "display_name": "set(int)",
+          "full_name": "clanguml::t20030::A::set(int)",
           "id": "2212978510776223413",
           "name": "set",
           "namespace": "",
@@ -200,6 +209,7 @@ int tmain(bool f, int a)
         },
         {
           "display_name": "value() const",
+          "full_name": "clanguml::t20030::A::value() const",
           "id": "1754957340376276968",
           "name": "value",
           "namespace": "",
@@ -213,6 +223,7 @@ int tmain(bool f, int a)
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20030::A",
       "id": "1081707114848460702",
       "name": "A",
       "namespace": "clanguml::t20030",
@@ -226,6 +237,7 @@ int tmain(bool f, int a)
     },
     {
       "display_name": "tmain(bool,int)",
+      "full_name": "clanguml::t20030::tmain(bool,int)",
       "id": "36090614888670483",
       "name": "tmain",
       "namespace": "clanguml::t20030",
@@ -389,6 +401,26 @@ int tmain(bool f, int a)
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "32184916294885915",
+            "participant_id": "1081707114848460702"
+          },
+          "name": "create()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 11,
+            "file": "t20030.cc",
+            "line": 8,
+            "translation_unit": "t20030.cc"
+          },
+          "to": {
+            "activity_id": "890578100069139188",
+            "participant_id": "1081707114848460702"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "36090614888670483",
diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg
index c7901eee..76187b59 100644
--- a/docs/test_cases/t20030_sequence.svg
+++ b/docs/test_cases/t20030_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="777px" preserveAspectRatio="none" style="width:427px;height:777px;" version="1.1" viewBox="0 0 427 777" width="427px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkudjqfanbvu4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fx4wnqgj6hrfa" 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(#fkudjqfanbvu4)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="193" x2="193" y1="38.2969" y2="736.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="361" x2="361" y1="38.2969" y2="736.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L35" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L35" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="755.8857">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L4" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L4" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="755.8857">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="180" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="187" y="755.8857">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L41" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L41" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#fkudjqfanbvu4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
+      <rect fill="#FEFECE" filter="url(#fx4wnqgj6hrfa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="303" y="735.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="310" y="755.8857">tmain(bool,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fkudjqfanbvu4)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="194.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="97.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="156.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="193.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="271.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="308.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="373.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="410.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="474.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="511.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="589.625"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="193.5" y="626.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="188.5" y="704.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fx4wnqgj6hrfa)" height="476.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="356.5" y="242.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="65.5,64.2969,55.5,68.2969,65.5,72.2969,61.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="59.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176.5,93.4297,186.5,97.4297,176.5,101.4297,180.5,97.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="97.4297" y2="97.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="61.5" y="92.3638">A(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="176.5,152.5625,186.5,156.5625,176.5,160.5625,180.5,156.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="182.5" y1="156.5625" y2="156.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="61.5" y="151.4966">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="185.6953" y2="185.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="185.6953" y2="198.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="198.6953" y2="198.6953"/>
@@ -92,36 +92,36 @@
     </a>
     <polygon fill="#A80036" points="60.5,238.6953,50.5,242.6953,60.5,246.6953,56.5,242.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="54.5" x2="192.5" y1="242.6953" y2="242.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,267.8281,199.5,271.8281,209.5,275.8281,205.5,271.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="271.8281" y2="271.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="266.7622">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="300.9609" y2="300.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="300.9609" y2="313.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="313.9609" y2="313.9609"/>
       <polygon fill="#A80036" points="214.5,309.9609,204.5,313.9609,214.5,317.9609,210.5,313.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="295.895">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,369.0938,199.5,373.0938,209.5,377.0938,205.5,373.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="373.0938" y2="373.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="215.5" y="368.0278">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="402.2266" y2="402.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="402.2266" y2="415.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="415.2266" y2="415.2266"/>
       <polygon fill="#A80036" points="214.5,411.2266,204.5,415.2266,214.5,419.2266,210.5,415.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="51" x="210.5" y="397.1606">create()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L45" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L45" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,470.3594,199.5,474.3594,209.5,478.3594,205.5,474.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="474.3594" y2="474.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="215.5" y="469.2935">operator+=(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="503.4922" y2="503.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="503.4922" y2="516.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="516.4922" y2="516.4922"/>
@@ -130,12 +130,12 @@
     </a>
     <polygon fill="#A80036" points="344.5,556.4922,354.5,560.4922,344.5,564.4922,348.5,560.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="560.4922" y2="560.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,585.625,199.5,589.625,209.5,593.625,205.5,589.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="589.625" y2="589.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="215.5" y="584.5591">operator=(const A &amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="245.5" y1="618.7578" y2="618.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245.5" x2="245.5" y1="618.7578" y2="631.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="204.5" x2="245.5" y1="631.7578" y2="631.7578"/>
@@ -144,7 +144,7 @@
     </a>
     <polygon fill="#A80036" points="344.5,671.7578,354.5,675.7578,344.5,679.7578,348.5,675.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="193.5" x2="350.5" y1="675.7578" y2="675.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20030/t20030.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="209.5,700.8906,199.5,704.8906,209.5,708.8906,205.5,704.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="203.5" x2="355.5" y1="704.8906" y2="704.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="215.5" y="699.8247">value() const</text>
diff --git a/docs/test_cases/t20031.md b/docs/test_cases/t20031.md
index 90ac6d95..8122b515 100644
--- a/docs/test_cases/t20031.md
+++ b/docs/test_cases/t20031.md
@@ -97,6 +97,7 @@ int tmain(bool f, int a)
   "participants": [
     {
       "display_name": "tmain(int)",
+      "full_name": "clanguml::t20031::tmain(int)",
       "id": "1045973591033429178",
       "name": "tmain",
       "namespace": "clanguml::t20031",
@@ -110,6 +111,7 @@ int tmain(bool f, int a)
     },
     {
       "display_name": "magic()",
+      "full_name": "clanguml::t20031::magic()",
       "id": "2265790048300959619",
       "name": "magic",
       "namespace": "clanguml::t20031",
@@ -123,6 +125,7 @@ int tmain(bool f, int a)
     },
     {
       "display_name": "tmain(bool,int)",
+      "full_name": "clanguml::t20031::tmain(bool,int)",
       "id": "2189754495514350927",
       "name": "tmain",
       "namespace": "clanguml::t20031",
@@ -136,6 +139,7 @@ int tmain(bool f, int a)
     },
     {
       "display_name": "execute(std::function<int ()>)",
+      "full_name": "clanguml::t20031::execute(std::function<int ()>)",
       "id": "2230160420908832598",
       "name": "execute",
       "namespace": "clanguml::t20031",
@@ -151,6 +155,7 @@ int tmain(bool f, int a)
       "activities": [
         {
           "display_name": "value() const",
+          "full_name": "clanguml::t20031::A::value() const",
           "id": "1089278431155817348",
           "name": "value",
           "namespace": "",
@@ -164,6 +169,7 @@ int tmain(bool f, int a)
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20031::A",
       "id": "1081580052625775404",
       "name": "A",
       "namespace": "clanguml::t20031",
diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg
index 40b7ac7f..58c30a08 100644
--- a/docs/test_cases/t20031_sequence.svg
+++ b/docs/test_cases/t20031_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="197px" preserveAspectRatio="none" style="width:578px;height:197px;" version="1.1" viewBox="0 0 578 197" width="578px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f16lzbc0i1f7m4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1941mza2gtzng" 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,64 +9,64 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="49" x2="49" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="135" x2="135" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="238" x2="238" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="420" x2="420" y1="38.2969" y2="157.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="557" x2="557" y1="38.2969" y2="157.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="22.9951">tmain(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="8" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="15" y="176.4248">tmain(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L5" target="_top" title="magic" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L5" xlink:show="new" xlink:title="magic" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="22.9951">magic()</text>
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="101" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="108" y="176.4248">magic()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L45" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L45" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="22.9951">tmain(bool,int)</text>
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="180" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="187" y="176.4248">tmain(bool,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L8" target="_top" title="execute" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L8" xlink:show="new" xlink:title="execute" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="22.9951">execute(std::function&lt;int ()&gt;)</text>
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="307" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="209" x="314" y="176.4248">execute(std::function&lt;int ()&gt;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f16lzbc0i1f7m4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1941mza2gtzng)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="544" y="156.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="551" y="176.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16lzbc0i1f7m4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="20" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="44.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="130.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="71.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="415.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1941mza2gtzng)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="125.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="118.5,50.2969,128.5,54.2969,118.5,58.2969,122.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="54.5" x2="124.5" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="60.5,64.2969,50.5,68.2969,60.5,72.2969,56.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="54.5" x2="134.5" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="403.5,78.2969,413.5,82.2969,403.5,86.2969,407.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="409.5" y1="82.2969" y2="82.2969"/>
     </a>
     <polygon fill="#A80036" points="254.5,92.2969,244.5,96.2969,254.5,100.2969,250.5,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="248.5" x2="419.5" y1="96.2969" y2="96.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20031/t20031.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="540.5,121.4297,550.5,125.4297,540.5,129.4297,544.5,125.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243.5" x2="546.5" y1="125.4297" y2="125.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="250.5" y="120.3638">value() const</text>
diff --git a/docs/test_cases/t20032.md b/docs/test_cases/t20032.md
index 2692af8c..fc54366c 100644
--- a/docs/test_cases/t20032.md
+++ b/docs/test_cases/t20032.md
@@ -57,6 +57,7 @@ void tmain(int argc, char **argv)
   "participants": [
     {
       "display_name": "tmain(int,char **)",
+      "full_name": "clanguml::t20032::tmain(int,char **)",
       "id": "2159371207846335450",
       "name": "tmain",
       "namespace": "clanguml::t20032",
@@ -72,6 +73,7 @@ void tmain(int argc, char **argv)
       "activities": [
         {
           "display_name": "b(int)",
+          "full_name": "clanguml::t20032::B::b(int)",
           "id": "1775727925274471949",
           "name": "b",
           "namespace": "",
@@ -85,6 +87,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "b(double)",
+          "full_name": "clanguml::t20032::B::b(double)",
           "id": "404223226092650061",
           "name": "b",
           "namespace": "",
@@ -98,6 +101,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "b(const char *)",
+          "full_name": "clanguml::t20032::B::b(const char *)",
           "id": "1676684483397143166",
           "name": "b",
           "namespace": "",
@@ -111,6 +115,7 @@ void tmain(int argc, char **argv)
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20032::B",
       "id": "775765108342558014",
       "name": "B",
       "namespace": "clanguml::t20032",
@@ -126,6 +131,7 @@ void tmain(int argc, char **argv)
       "activities": [
         {
           "display_name": "a1(int)",
+          "full_name": "clanguml::t20032::A::a1(int)",
           "id": "913842443932719355",
           "name": "a1",
           "namespace": "",
@@ -139,6 +145,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "a2(double)",
+          "full_name": "clanguml::t20032::A::a2(double)",
           "id": "1293114170675037977",
           "name": "a2",
           "namespace": "",
@@ -152,6 +159,7 @@ void tmain(int argc, char **argv)
         },
         {
           "display_name": "a3(const char *)",
+          "full_name": "clanguml::t20032::A::a3(const char *)",
           "id": "2099821524363509275",
           "name": "a3",
           "namespace": "",
@@ -165,6 +173,7 @@ void tmain(int argc, char **argv)
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20032::A",
       "id": "1674177120713592616",
       "name": "A",
       "namespace": "clanguml::t20032",
diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg
index e69e3b41..2b8f3b2a 100644
--- a/docs/test_cases/t20032_sequence.svg
+++ b/docs/test_cases/t20032_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="448px" preserveAspectRatio="none" style="width:354px;height:448px;" version="1.1" viewBox="0 0 354 448" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f12sdqz38tqvvc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwzduhj44ndcy" 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(#f12sdqz38tqvvc)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="407.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="407.8906"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="407.8906"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12sdqz38tqvvc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwzduhj44ndcy)" 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(#f12sdqz38tqvvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#fwzduhj44ndcy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="426.8857">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12sdqz38tqvvc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwzduhj44ndcy)" 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(#f12sdqz38tqvvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#fwzduhj44ndcy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="426.8857">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12sdqz38tqvvc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwzduhj44ndcy)" 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(#f12sdqz38tqvvc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
+      <rect fill="#FEFECE" filter="url(#fwzduhj44ndcy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="406.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="426.8857">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f12sdqz38tqvvc)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="341.5938" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="87.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="302.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fwzduhj44ndcy)" height="29.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="331.625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.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>
@@ -60,12 +60,12 @@
     <polygon fill="#A80036" points="91.5,152.8281,81.5,156.8281,91.5,160.8281,87.5,156.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="156.8281" y2="156.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="97.5" y="151.7622">int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,181.9609,193.5,185.9609,183.5,189.9609,187.5,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="180.895">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,211.0938,326.5,215.0938,316.5,219.0938,320.5,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="210.0278">a2(double)</text>
@@ -76,12 +76,12 @@
     <polygon fill="#A80036" points="91.5,269.3594,81.5,273.3594,91.5,277.3594,87.5,273.3594" 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="273.3594" y2="273.3594"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="97.5" y="268.2935">double</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,298.4922,193.5,302.4922,183.5,306.4922,187.5,302.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="302.4922" y2="302.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="297.4263">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20032/t20032.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,327.625,326.5,331.625,316.5,335.625,320.5,331.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="331.625" y2="331.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="326.5591">a3(const char *)</text>
diff --git a/docs/test_cases/t20033.md b/docs/test_cases/t20033.md
index 1c01220c..5eb313af 100644
--- a/docs/test_cases/t20033.md
+++ b/docs/test_cases/t20033.md
@@ -95,6 +95,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20033::tmain()",
       "id": "2284981553733959328",
       "name": "tmain",
       "namespace": "clanguml::t20033",
@@ -110,6 +111,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a1()",
+          "full_name": "clanguml::t20033::A::a1()",
           "id": "558885502745634115",
           "name": "a1",
           "namespace": "",
@@ -123,6 +125,7 @@ int tmain()
         },
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20033::A::a2()",
           "id": "748502947476611794",
           "name": "a2",
           "namespace": "",
@@ -136,6 +139,7 @@ int tmain()
         },
         {
           "display_name": "a3()",
+          "full_name": "clanguml::t20033::A::a3()",
           "id": "55903385814245839",
           "name": "a3",
           "namespace": "",
@@ -149,6 +153,7 @@ int tmain()
         },
         {
           "display_name": "a4()",
+          "full_name": "clanguml::t20033::A::a4()",
           "id": "1686426476339443579",
           "name": "a4",
           "namespace": "",
@@ -162,6 +167,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20033::A",
       "id": "615995652843962691",
       "name": "A",
       "namespace": "clanguml::t20033",
diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg
index 889dfc1e..7748f839 100644
--- a/docs/test_cases/t20033_sequence.svg
+++ b/docs/test_cases/t20033_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="1055px" preserveAspectRatio="none" style="width:340px;height:1055px;" version="1.1" viewBox="0 0 340 1055" width="340px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jzvgwcona3fe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fg88jyvj3236q" 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,73 +9,73 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="72.4297"/>
     <rect fill="#FFFFFF" height="57.9375" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="130.3672"/>
     <rect fill="#FFFFFF" height="144.2031" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="188.3047"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="315" x="13" y="332.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
     <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="159" x="13" y="921.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="1014.7656"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="122.5" x2="122.5" y1="38.2969" y2="1014.7656"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jzvgwcona3fe)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L14" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L14" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg88jyvj3236q)" 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(#f1jzvgwcona3fe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
+      <rect fill="#FEFECE" filter="url(#fg88jyvj3236q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="1013.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="1033.7607">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jzvgwcona3fe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg88jyvj3236q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1jzvgwcona3fe)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
+      <rect fill="#FEFECE" filter="url(#fg88jyvj3236q)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="109.5" y="1013.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="116.5" y="1033.7607">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1jzvgwcona3fe)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="956.4688" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="108.3672"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="166.3047"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="224.2422"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="267.375"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="310.5078"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="355.6406"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="429.9063"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="473.0391"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="547.3047"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="590.4375"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="640.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="707.8359"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="782.1016"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="825.2344"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="899.5"/>
+    <rect fill="#FFFFFF" filter="url(#fg88jyvj3236q)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="118" y="975.7656"/>
     <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="322.3438" style="stroke: #000000; stroke-width: 2.0;" width="315" 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>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="42" x="92" y="67.5073">[false]</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="73.4297" y2="73.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="310" x="18" y="83.6401">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 100 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,104.3672,116,108.3672,106,112.3672,110,108.3672" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="108.3672" y2="108.3672"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="103.3013">a1()</text>
@@ -84,7 +84,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="122.3672" y2="122.3672"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="131.3672" y2="131.3672"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="302" x="18" y="141.5776">[reinterpret_cast&lt;uint64_t&gt;(&amp;a) % 64 == 0ULL]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,162.3047,116,166.3047,106,170.3047,110,166.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="166.3047" y2="166.3047"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="161.2388">a2()</text>
@@ -93,7 +93,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="180.3047" y2="180.3047"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="189.3047" y2="189.3047"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="182" x="18" y="199.5151">[a.a2() == 2 &amp;&amp; a.a3() == 3]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,220.2422,116,224.2422,106,228.2422,110,224.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="224.2422" y2="224.2422"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="219.1763">[</text>
@@ -102,7 +102,7 @@
     </a>
     <polygon fill="#A80036" points="72,234.2422,62,238.2422,72,242.2422,68,238.2422" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="238.2422" y2="238.2422"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,263.375,116,267.375,106,271.375,110,267.375" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="267.375" y2="267.375"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="262.3091">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="72,277.375,62,281.375,72,285.375,68,281.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="281.375" y2="281.375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,306.5078,116,310.5078,106,314.5078,110,310.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="310.5078" y2="310.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="305.4419">a3()</text>
@@ -119,7 +119,7 @@
     <polygon fill="#A80036" points="72,320.5078,62,324.5078,72,328.5078,68,324.5078" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="324.5078" y2="324.5078"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="328" y1="333.5078" y2="333.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,351.6406,116,355.6406,106,359.6406,110,355.6406" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="355.6406" y2="355.6406"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="350.5747">a4()</text>
@@ -130,7 +130,7 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="216" x="13" y="391.6406"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="404.7075">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="132" x="92" y="403.8511">[int i = a.a2(); i != 2]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,425.9063,116,429.9063,106,433.9063,110,429.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="429.9063" y2="429.9063"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="424.8403">[</text>
@@ -139,7 +139,7 @@
     </a>
     <polygon fill="#A80036" points="72,439.9063,62,443.9063,72,447.9063,68,443.9063" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="443.9063" y2="443.9063"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,469.0391,116,473.0391,106,477.0391,110,473.0391" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="473.0391" y2="473.0391"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="467.9731">a3()</text>
@@ -150,7 +150,7 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="254" x="13" y="509.0391"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="522.106">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="157" x="105" y="521.2495">[int i = 0; i &lt; a.a2(); i++]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,543.3047,116,547.3047,106,551.3047,110,547.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="547.3047" y2="547.3047"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="542.2388">[</text>
@@ -159,14 +159,14 @@
     </a>
     <polygon fill="#A80036" points="72,557.3047,62,561.3047,72,565.3047,68,561.3047" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="561.3047" y2="561.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,586.4375,116,590.4375,106,594.4375,110,590.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="590.4375" y2="590.4375"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="585.3716">a3()</text>
     </a>
     <polygon fill="#A80036" points="72,600.4375,62,604.4375,72,608.4375,68,604.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="604.4375" y2="604.4375"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,636.5703,116,640.5703,106,644.5703,110,640.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="640.5703" y2="640.5703"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="635.5044">a3()</text>
@@ -177,7 +177,7 @@
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="189" x="13" y="669.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="682.6372">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="92" x="105" y="681.7808">[retry_count--]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,703.8359,116,707.8359,106,711.8359,110,707.8359" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="707.8359" y2="707.8359"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="702.77">a2()</text>
@@ -188,14 +188,14 @@
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="252" x="13" y="743.8359"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="756.9028">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="155" x="105" y="756.0464">[retry_count++ &lt; a.a3()]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,778.1016,116,782.1016,106,786.1016,110,782.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="782.1016" y2="782.1016"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="777.0356">a4()</text>
     </a>
     <polygon fill="#A80036" points="72,792.1016,62,796.1016,72,800.1016,68,796.1016" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="122" y1="796.1016" y2="796.1016"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,821.2344,116,825.2344,106,829.2344,110,825.2344" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="825.2344" y2="825.2344"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="820.1685">[</text>
@@ -208,7 +208,7 @@
     <rect fill="none" height="62.2656" style="stroke: #000000; stroke-width: 2.0;" width="159" x="13" y="861.2344"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="874.3013">alt</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="75" x="92" y="873.4448">[a.a4() % 6]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,895.5,116,899.5,106,903.5,110,899.5" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="899.5" y2="899.5"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="68" y="894.4341">[</text>
@@ -222,7 +222,7 @@
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="133.5" x="13" y="937.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="950.5669">loop</text>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="105" y="949.7104">[ints]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20033/t20033.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="106,971.7656,116,975.7656,106,979.7656,110,975.7656" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="112" y1="975.7656" y2="975.7656"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="68" y="970.6997">a4()</text>
diff --git a/docs/test_cases/t20034.md b/docs/test_cases/t20034.md
index e840ab54..b31f8c94 100644
--- a/docs/test_cases/t20034.md
+++ b/docs/test_cases/t20034.md
@@ -103,6 +103,7 @@ void B::b4()
       "activities": [
         {
           "display_name": "d2()",
+          "full_name": "clanguml::t20034::D::d2()",
           "id": "1707514178726476738",
           "name": "d2",
           "namespace": "",
@@ -116,6 +117,7 @@ void B::b4()
         }
       ],
       "display_name": "D",
+      "full_name": "clanguml::t20034::D",
       "id": "272777525372220260",
       "name": "D",
       "namespace": "clanguml::t20034",
@@ -131,6 +133,7 @@ void B::b4()
       "activities": [
         {
           "display_name": "c2()",
+          "full_name": "clanguml::t20034::C::c2()",
           "id": "472904899982022039",
           "name": "c2",
           "namespace": "",
@@ -144,6 +147,7 @@ void B::b4()
         },
         {
           "display_name": "c4()",
+          "full_name": "clanguml::t20034::C::c4()",
           "id": "395720534444062628",
           "name": "c4",
           "namespace": "",
@@ -157,6 +161,7 @@ void B::b4()
         },
         {
           "display_name": "c1()",
+          "full_name": "clanguml::t20034::C::c1()",
           "id": "148530508384958711",
           "name": "c1",
           "namespace": "",
@@ -170,6 +175,7 @@ void B::b4()
         },
         {
           "display_name": "c3()",
+          "full_name": "clanguml::t20034::C::c3()",
           "id": "2116989777037608337",
           "name": "c3",
           "namespace": "",
@@ -183,6 +189,7 @@ void B::b4()
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20034::C",
       "id": "2153793652884753477",
       "name": "C",
       "namespace": "clanguml::t20034",
@@ -198,6 +205,7 @@ void B::b4()
       "activities": [
         {
           "display_name": "b2()",
+          "full_name": "clanguml::t20034::B::b2()",
           "id": "1034410188120190919",
           "name": "b2",
           "namespace": "",
@@ -211,6 +219,7 @@ void B::b4()
         },
         {
           "display_name": "b4()",
+          "full_name": "clanguml::t20034::B::b4()",
           "id": "1774155279072101253",
           "name": "b4",
           "namespace": "",
@@ -224,6 +233,7 @@ void B::b4()
         },
         {
           "display_name": "b1()",
+          "full_name": "clanguml::t20034::B::b1()",
           "id": "289899516984058785",
           "name": "b1",
           "namespace": "",
@@ -237,6 +247,7 @@ void B::b4()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20034::B",
       "id": "1214895773389400008",
       "name": "B",
       "namespace": "clanguml::t20034",
@@ -252,6 +263,7 @@ void B::b4()
       "activities": [
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20034::A::a2()",
           "id": "1307188853155365430",
           "name": "a2",
           "namespace": "",
@@ -265,6 +277,7 @@ void B::b4()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20034::A",
       "id": "1029414747563549012",
       "name": "A",
       "namespace": "clanguml::t20034",
@@ -280,6 +293,7 @@ void B::b4()
       "activities": [
         {
           "display_name": "operator()() const",
+          "full_name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)::operator()() const",
           "id": "1534431449322420953",
           "name": "operator()",
           "namespace": "",
@@ -287,6 +301,7 @@ void B::b4()
         }
       ],
       "display_name": "D::d2()::(lambda t20034.cc:56:18)",
+      "full_name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)",
       "id": "1026588549514900751",
       "name": "D::d2()::(lambda t20034.cc:56:18)",
       "namespace": "clanguml::t20034",
diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg
index a0427171..9bc2f7b6 100644
--- a/docs/test_cases/t20034_sequence.svg
+++ b/docs/test_cases/t20034_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="934px" preserveAspectRatio="none" style="width:499px;height:934px;" version="1.1" viewBox="0 0 499 934" width="499px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1my2dqym2z5w7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgqgdvudczto5" 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"/>
@@ -14,154 +14,154 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="152" x2="152" y1="38.2969" y2="894.3516"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="894.3516"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="353.5" x2="353.5" y1="38.2969" y2="894.3516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L44" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L44" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="38.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="45.5" y="913.3467">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="913.3467">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="138" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="145" y="913.3467">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="188.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="195.5" y="913.3467">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L56" target="_top" title="D::d2()##(lambda t20034.cc:56:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="D::d2()##(lambda t20034.cc:56:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="22.9951">D::d2()::(lambda t20034.cc:56:18)</text>
-      <rect fill="#FEFECE" filter="url(#f1my2dqym2z5w7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="893.3516"/>
+      <rect fill="#FEFECE" filter="url(#fgqgdvudczto5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="253" x="225.5" y="893.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="239" x="232.5" y="913.3467">D::d2()::(lambda t20034.cc:56:18)</text>
     </a>
     <polygon fill="#A80036" points="41,65.4297,51,69.4297,41,73.4297,45,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="64.3638">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="93.4966">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,152.8281,200,156.8281,190,160.8281,194,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="151.7622">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1my2dqym2z5w7)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="177.8281"/>
+    <rect fill="#EEEEEE" filter="url(#fgqgdvudczto5)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="177.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="177.8281" y2="177.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="180.8281" y2="180.8281"/>
     <polygon fill="#A80036" points="41,209.9609,51,213.9609,41,217.9609,45,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="213.9609" y2="213.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="208.895">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L57" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L57" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="342,239.0938,352,243.0938,342,247.0938,346,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="348" y1="243.0938" y2="243.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="60" y="238.0278">operator()() const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L56" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L56" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,268.2266,203,272.2266,213,276.2266,209,272.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="207" x2="353" y1="272.2266" y2="272.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="219" y="267.1606">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1my2dqym2z5w7)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="293.2266"/>
+    <rect fill="#EEEEEE" filter="url(#fgqgdvudczto5)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="293.2266" y2="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="296.2266" y2="296.2266"/>
     <polygon fill="#A80036" points="41,325.3594,51,329.3594,41,333.3594,45,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="329.3594" y2="329.3594"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="324.2935">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,354.4922,200,358.4922,190,362.4922,194,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="196" y1="358.4922" y2="358.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="60" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1my2dqym2z5w7)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="379.4922"/>
+    <rect fill="#EEEEEE" filter="url(#fgqgdvudczto5)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="379.4922" y2="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="382.4922" y2="382.4922"/>
     <polygon fill="#A80036" points="41,411.625,51,415.625,41,419.625,45,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="415.625" y2="415.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="410.5591">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="444.7578" y2="444.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="439.6919">c4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="194" y1="503.0234" y2="503.0234"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="194" y1="503.0234" y2="516.0234"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="153" x2="194" y1="516.0234" y2="516.0234"/>
       <polygon fill="#A80036" points="163,512.0234,153,516.0234,163,520.0234,159,516.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="497.9575">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,541.1563,200,545.1563,190,549.1563,194,545.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="545.1563" y2="545.1563"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="540.0903">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1my2dqym2z5w7)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="566.1563"/>
+    <rect fill="#EEEEEE" filter="url(#fgqgdvudczto5)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="566.1563"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="566.1563" y2="566.1563"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="569.1563" y2="569.1563"/>
     <polygon fill="#A80036" points="41,598.2891,51,602.2891,41,606.2891,45,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="602.2891" y2="602.2891"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="597.2231">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L48" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L48" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,627.4219,100,631.4219,90,635.4219,94,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="631.4219" y2="631.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="626.356">c1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,656.5547,150,660.5547,140,664.5547,144,660.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="660.5547" y2="660.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="655.4888">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,685.6875,200,689.6875,190,693.6875,194,689.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="689.6875" y2="689.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="684.6216">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1my2dqym2z5w7)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="710.6875"/>
+    <rect fill="#EEEEEE" filter="url(#fgqgdvudczto5)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="484.5" x="3" y="710.6875"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="710.6875" y2="710.6875"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="487.5" y1="713.6875" y2="713.6875"/>
     <polygon fill="#A80036" points="41,742.8203,51,746.8203,41,750.8203,45,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="47" y1="746.8203" y2="746.8203"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="741.7544">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L51" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L51" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,771.9531,100,775.9531,90,779.9531,94,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="96" y1="775.9531" y2="775.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="60" y="770.8872">c3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="144" y1="805.0859" y2="805.0859"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="144" x2="144" y1="805.0859" y2="818.0859"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="103" x2="144" y1="818.0859" y2="818.0859"/>
       <polygon fill="#A80036" points="113,814.0859,103,818.0859,113,822.0859,109,818.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="109" y="800.02">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,843.2188,150,847.2188,140,851.2188,144,847.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="847.2188" y2="847.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="842.1528">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20034/t20034.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="190,872.3516,200,876.3516,190,880.3516,194,876.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="152" x2="196" y1="876.3516" y2="876.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="159" y="871.2856">a2()</text>
diff --git a/docs/test_cases/t20035.md b/docs/test_cases/t20035.md
index a9d791df..f1ad44a2 100644
--- a/docs/test_cases/t20035.md
+++ b/docs/test_cases/t20035.md
@@ -44,6 +44,7 @@ int tmain(int argc, char **argv) { return a(argc); }
   "participants": [
     {
       "display_name": "tmain(int,char **)",
+      "full_name": "clanguml::t20035::tmain(int,char **)",
       "id": "1380099746477810520",
       "name": "tmain",
       "namespace": "clanguml::t20035",
@@ -57,6 +58,7 @@ int tmain(int argc, char **argv) { return a(argc); }
     },
     {
       "display_name": "a(int)",
+      "full_name": "clanguml::t20035::a(int)",
       "id": "1503144831959453736",
       "name": "a",
       "namespace": "clanguml::t20035",
@@ -70,6 +72,7 @@ int tmain(int argc, char **argv) { return a(argc); }
     },
     {
       "display_name": "b1(int)",
+      "full_name": "clanguml::t20035::b1(int)",
       "id": "440199113909747659",
       "name": "b1",
       "namespace": "clanguml::t20035",
@@ -83,6 +86,7 @@ int tmain(int argc, char **argv) { return a(argc); }
     },
     {
       "display_name": "c(int)",
+      "full_name": "clanguml::t20035::c(int)",
       "id": "709102392181022891",
       "name": "c",
       "namespace": "clanguml::t20035",
diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg
index da4171f7..6ce8d200 100644
--- a/docs/test_cases/t20035_sequence.svg
+++ b/docs/test_cases/t20035_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="140px" preserveAspectRatio="none" style="width:349px;height:140px;" version="1.1" viewBox="0 0 349 140" width="349px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f24o79gr3216a" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1aqf04unb2mmk" 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"/>
@@ -13,39 +13,39 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="179" x2="179" y1="38.2969" y2="100.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="247" x2="247" y1="38.2969" y2="100.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="315" x2="315" y1="38.2969" y2="100.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f24o79gr3216a)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L12" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" 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(#f24o79gr3216a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="119.292">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f24o79gr3216a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="22.9951">a(int)</text>
-      <rect fill="#FEFECE" filter="url(#f24o79gr3216a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="153" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="160" y="119.292">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f24o79gr3216a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L6" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="b1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="22.9951">b1(int)</text>
-      <rect fill="#FEFECE" filter="url(#f24o79gr3216a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="216" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="45" x="223" y="119.292">b1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f24o79gr3216a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L4" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L4" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="22.9951">c(int)</text>
-      <rect fill="#FEFECE" filter="url(#f24o79gr3216a)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1aqf04unb2mmk)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="289" y="99.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="35" x="296" y="119.292">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="167.5,50.2969,177.5,54.2969,167.5,58.2969,171.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="75.5" x2="173.5" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="235.5,64.2969,245.5,68.2969,235.5,72.2969,239.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="179.5" x2="241.5" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20035/t20035.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="303.5,78.2969,313.5,82.2969,303.5,86.2969,307.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="247.5" x2="309.5" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20036.md b/docs/test_cases/t20036.md
index 9b3e4dae..5f24bb5e 100644
--- a/docs/test_cases/t20036.md
+++ b/docs/test_cases/t20036.md
@@ -75,6 +75,7 @@ struct D {
       "activities": [
         {
           "display_name": "c1()",
+          "full_name": "clanguml::t20036::C::c1()",
           "id": "1742507735898803374",
           "name": "c1",
           "namespace": "",
@@ -88,6 +89,7 @@ struct D {
         },
         {
           "display_name": "c2()",
+          "full_name": "clanguml::t20036::C::c2()",
           "id": "128745191811378037",
           "name": "c2",
           "namespace": "",
@@ -101,6 +103,7 @@ struct D {
         },
         {
           "display_name": "c4()",
+          "full_name": "clanguml::t20036::C::c4()",
           "id": "1735839766717973272",
           "name": "c4",
           "namespace": "",
@@ -114,6 +117,7 @@ struct D {
         },
         {
           "display_name": "c3()",
+          "full_name": "clanguml::t20036::C::c3()",
           "id": "1523531372012294984",
           "name": "c3",
           "namespace": "",
@@ -127,6 +131,7 @@ struct D {
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20036::C",
       "id": "589458700000736705",
       "name": "C",
       "namespace": "clanguml::t20036",
@@ -142,6 +147,7 @@ struct D {
       "activities": [
         {
           "display_name": "b1()",
+          "full_name": "clanguml::t20036::B::b1()",
           "id": "203660950902052846",
           "name": "b1",
           "namespace": "",
@@ -155,6 +161,7 @@ struct D {
         },
         {
           "display_name": "b2()",
+          "full_name": "clanguml::t20036::B::b2()",
           "id": "1726094580455938498",
           "name": "b2",
           "namespace": "",
@@ -168,6 +175,7 @@ struct D {
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20036::B",
       "id": "607147607288902300",
       "name": "B",
       "namespace": "clanguml::t20036",
@@ -183,6 +191,7 @@ struct D {
       "activities": [
         {
           "display_name": "a2()",
+          "full_name": "clanguml::t20036::A::a2()",
           "id": "2124074228514438863",
           "name": "a2",
           "namespace": "",
@@ -196,6 +205,7 @@ struct D {
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20036::A",
       "id": "399722216848214287",
       "name": "A",
       "namespace": "clanguml::t20036",
@@ -211,6 +221,7 @@ struct D {
       "activities": [
         {
           "display_name": "d1()",
+          "full_name": "clanguml::t20036::D::d1()",
           "id": "701488875613014930",
           "name": "d1",
           "namespace": "",
@@ -224,6 +235,7 @@ struct D {
         },
         {
           "display_name": "d3()",
+          "full_name": "clanguml::t20036::D::d3()",
           "id": "1897648539724183065",
           "name": "d3",
           "namespace": "",
@@ -237,6 +249,7 @@ struct D {
         },
         {
           "display_name": "d2()",
+          "full_name": "clanguml::t20036::D::d2()",
           "id": "1534436779969087203",
           "name": "d2",
           "namespace": "",
@@ -250,6 +263,7 @@ struct D {
         }
       ],
       "display_name": "D",
+      "full_name": "clanguml::t20036::D",
       "id": "847434467114564641",
       "name": "D",
       "namespace": "clanguml::t20036",
diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg
index 88d8d36c..bac4d9b4 100644
--- a/docs/test_cases/t20036_sequence.svg
+++ b/docs/test_cases/t20036_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="834px" preserveAspectRatio="none" style="width:233px;height:834px;" version="1.1" viewBox="0 0 233 834" width="233px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bhoo9329q0ql" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1eo504eiknid3" 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"/>
@@ -13,131 +13,131 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="102" x2="102" y1="38.2969" y2="793.9531"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="793.9531"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="201.5" x2="201.5" y1="38.2969" y2="793.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="38" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="45" y="812.9482">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="88" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="95" y="812.9482">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="138.5" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="145.5" y="812.9482">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f1bhoo9329q0ql)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
+      <rect fill="#FEFECE" filter="url(#f1eo504eiknid3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="187.5" y="792.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="194.5" y="812.9482">D</text>
     </a>
     <polygon fill="#A80036" points="40,65.4297,50,69.4297,40,73.4297,44,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="64.3638">c1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,94.5625,100,98.5625,90,102.5625,94,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="93.4966">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,123.6953,150,127.6953,140,131.6953,144,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="122.6294">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1bhoo9329q0ql)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
+    <rect fill="#EEEEEE" filter="url(#f1eo504eiknid3)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="148.6953"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="148.6953" y2="148.6953"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="151.6953" y2="151.6953"/>
     <polygon fill="#A80036" points="190,180.8281,200,184.8281,190,188.8281,194,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="184.8281" y2="184.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="179.7622">d1()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="63,209.9609,53,213.9609,63,217.9609,59,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="213.9609" y2="213.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="208.895">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,239.0938,100,243.0938,90,247.0938,94,243.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="243.0938" y2="243.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="238.0278">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,268.2266,150,272.2266,140,276.2266,144,272.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="272.2266" y2="272.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="267.1606">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1bhoo9329q0ql)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
+    <rect fill="#EEEEEE" filter="url(#f1eo504eiknid3)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="293.2266" y2="293.2266"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="296.2266" y2="296.2266"/>
     <polygon fill="#A80036" points="190,325.3594,200,329.3594,190,333.3594,194,329.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="329.3594" y2="329.3594"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="324.2935">d3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="163,354.4922,153,358.4922,163,362.4922,159,358.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="201" y1="358.4922" y2="358.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="169" y="353.4263">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1bhoo9329q0ql)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
+    <rect fill="#EEEEEE" filter="url(#f1eo504eiknid3)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="379.4922" y2="379.4922"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="382.4922" y2="382.4922"/>
     <polygon fill="#A80036" points="40,411.625,50,415.625,40,419.625,44,415.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="415.625" y2="415.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="410.5591">c4()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,440.7578,100,444.7578,90,448.7578,94,444.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="444.7578" y2="444.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="439.6919">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,469.8906,150,473.8906,140,477.8906,144,473.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="473.8906" y2="473.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="468.8247">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1bhoo9329q0ql)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
+    <rect fill="#EEEEEE" filter="url(#f1eo504eiknid3)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="494.8906"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="494.8906" y2="494.8906"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="497.8906" y2="497.8906"/>
     <polygon fill="#A80036" points="40,527.0234,50,531.0234,40,535.0234,44,531.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="46" y1="531.0234" y2="531.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="10" y="525.9575">c3()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="94" y1="560.1563" y2="560.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="94" x2="94" y1="560.1563" y2="573.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="53" x2="94" y1="573.1563" y2="573.1563"/>
       <polygon fill="#A80036" points="63,569.1563,53,573.1563,63,577.1563,59,573.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="59" y="555.0903">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,598.2891,100,602.2891,90,606.2891,94,602.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="602.2891" y2="602.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="597.2231">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,627.4219,150,631.4219,140,635.4219,144,631.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="631.4219" y2="631.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="626.356">a2()</text>
     </a>
-    <rect fill="#EEEEEE" filter="url(#f1bhoo9329q0ql)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
+    <rect fill="#EEEEEE" filter="url(#f1eo504eiknid3)" height="3" style="stroke: #EEEEEE; stroke-width: 1.0;" width="218.5" x="3" y="652.4219"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="652.4219" y2="652.4219"/>
     <line style="stroke: #000000; stroke-width: 1.0;" x1="3" x2="221.5" y1="655.4219" y2="655.4219"/>
     <polygon fill="#A80036" points="190,684.5547,200,688.5547,190,692.5547,194,688.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="196" y1="688.5547" y2="688.5547"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="10" y="683.4888">d2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="63,713.6875,53,717.6875,63,721.6875,59,717.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="57" x2="201" y1="717.6875" y2="717.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="69" y="712.6216">c2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="90,742.8203,100,746.8203,90,750.8203,94,746.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="52" x2="96" y1="746.8203" y2="746.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="59" y="741.7544">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20036/t20036.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="140,771.9531,150,775.9531,140,779.9531,144,775.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102" x2="146" y1="775.9531" y2="775.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="109" y="770.8872">a2()</text>
diff --git a/docs/test_cases/t20037.md b/docs/test_cases/t20037.md
index 216ef07c..40b13c62 100644
--- a/docs/test_cases/t20037.md
+++ b/docs/test_cases/t20037.md
@@ -67,6 +67,7 @@ void tmain(int argc, char **argv)
   "participants": [
     {
       "display_name": "tmain(int,char **)",
+      "full_name": "clanguml::t20037::tmain(int,char **)",
       "id": "1676651465274088148",
       "name": "tmain",
       "namespace": "clanguml::t20037",
@@ -80,6 +81,7 @@ void tmain(int argc, char **argv)
     },
     {
       "display_name": "a()",
+      "full_name": "clanguml::t20037::a()",
       "id": "150460916850164805",
       "name": "a",
       "namespace": "clanguml::t20037",
@@ -95,6 +97,7 @@ void tmain(int argc, char **argv)
       "activities": [
         {
           "display_name": "A()",
+          "full_name": "clanguml::t20037::A::A()",
           "id": "1135451191676888496",
           "name": "A",
           "namespace": "",
@@ -108,6 +111,7 @@ void tmain(int argc, char **argv)
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20037::A",
       "id": "1329920824155530080",
       "name": "A",
       "namespace": "clanguml::t20037",
@@ -121,6 +125,7 @@ void tmain(int argc, char **argv)
     },
     {
       "display_name": "initb()",
+      "full_name": "clanguml::t20037::initb()",
       "id": "1303264946914255327",
       "name": "initb",
       "namespace": "clanguml::t20037",
@@ -136,6 +141,7 @@ void tmain(int argc, char **argv)
       "activities": [
         {
           "display_name": "get()",
+          "full_name": "clanguml::t20037::B::get()",
           "id": "107877908217538137",
           "name": "get",
           "namespace": "",
@@ -149,6 +155,7 @@ void tmain(int argc, char **argv)
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20037::B",
       "id": "1746900845528413124",
       "name": "B",
       "namespace": "clanguml::t20037",
@@ -162,6 +169,7 @@ void tmain(int argc, char **argv)
     },
     {
       "display_name": "c()",
+      "full_name": "clanguml::t20037::c()",
       "id": "1349992361928784583",
       "name": "c",
       "namespace": "clanguml::t20037",
@@ -297,6 +305,46 @@ void tmain(int argc, char **argv)
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "150460916850164805",
+            "participant_id": "150460916850164805"
+          },
+          "name": "get()",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "column": 18,
+            "file": "t20037.cc",
+            "line": 28,
+            "translation_unit": "t20037.cc"
+          },
+          "to": {
+            "activity_id": "107877908217538137",
+            "participant_id": "1746900845528413124"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "150460916850164805",
+            "participant_id": "150460916850164805"
+          },
+          "name": "",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "column": 28,
+            "file": "t20037.cc",
+            "line": 28,
+            "translation_unit": "t20037.cc"
+          },
+          "to": {
+            "activity_id": "1349992361928784583",
+            "participant_id": "1349992361928784583"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "1676651465274088148",
@@ -316,6 +364,46 @@ void tmain(int argc, char **argv)
             "participant_id": "150460916850164805"
           },
           "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "150460916850164805",
+            "participant_id": "150460916850164805"
+          },
+          "name": "get()",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "column": 18,
+            "file": "t20037.cc",
+            "line": 28,
+            "translation_unit": "t20037.cc"
+          },
+          "to": {
+            "activity_id": "107877908217538137",
+            "participant_id": "1746900845528413124"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "150460916850164805",
+            "participant_id": "150460916850164805"
+          },
+          "name": "",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "column": 28,
+            "file": "t20037.cc",
+            "line": 28,
+            "translation_unit": "t20037.cc"
+          },
+          "to": {
+            "activity_id": "1349992361928784583",
+            "participant_id": "1349992361928784583"
+          },
+          "type": "message"
         }
       ],
       "start_from": {
diff --git a/docs/test_cases/t20037_sequence.svg b/docs/test_cases/t20037_sequence.svg
index a6e67d5d..924baa49 100644
--- a/docs/test_cases/t20037_sequence.svg
+++ b/docs/test_cases/t20037_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="483px" preserveAspectRatio="none" style="width:390px;height:483px;" version="1.1" viewBox="0 0 390 483" width="390px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkfzo9uohm1vn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fuyghqa5ze343" 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(#fkfzo9uohm1vn)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="171" x2="171" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="218.5" x2="218.5" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="270.5" x2="270.5" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="323.5" x2="323.5" y1="38.2969" y2="442.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365.5" x2="365.5" y1="38.2969" y2="442.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" 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(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="461.8232">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L23" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L23" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="22.9951">a()</text>
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="153" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="160" y="461.8232">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="205.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="212.5" y="461.8232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L19" target="_top" title="initb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L19" xlink:show="new" xlink:title="initb" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="22.9951">initb()</text>
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="242.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="249.5" y="461.8232">initb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="309.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="316.5" y="461.8232">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L21" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L21" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="22.9951">c()</text>
-      <rect fill="#FEFECE" filter="url(#fkfzo9uohm1vn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="441.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuyghqa5ze343)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="32" x="347.5" y="441.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="18" x="354.5" y="461.8232">c()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkfzo9uohm1vn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="376.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="172.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="240.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="166" y="339.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="214" y="83.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="266" y="127.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="170.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="269.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="318.5" y="368.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="198.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="297.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuyghqa5ze343)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360.5" y="396.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="154,50.2969,164,54.2969,154,58.2969,158,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="202,79.4297,212,83.4297,202,87.4297,206,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="208" y1="83.4297" y2="83.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="183" y="78.3638">A()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="254,123.4297,264,127.4297,254,131.4297,258,127.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="260" y1="127.4297" y2="127.4297"/>
     </a>
     <polygon fill="#A80036" points="187,137.4297,177,141.4297,187,145.4297,183,141.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="270" y1="141.4297" y2="141.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="306.5,166.5625,316.5,170.5625,306.5,174.5625,310.5,170.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="170.5625" y2="170.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="165.4966">get()</text>
     </a>
     <polygon fill="#A80036" points="187,180.5625,177,184.5625,187,188.5625,183,184.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="184.5625" y2="184.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348.5,194.5625,358.5,198.5625,348.5,202.5625,352.5,198.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="198.5625" y2="198.5625"/>
     </a>
@@ -105,18 +105,18 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="212.5625" y2="212.5625"/>
     <polygon fill="#A80036" points="91.5,222.5625,81.5,226.5625,91.5,230.5625,87.5,226.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="170" y1="226.5625" y2="226.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="154,236.5625,164,240.5625,154,244.5625,158,240.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="240.5625" y2="240.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="306.5,265.6953,316.5,269.6953,306.5,273.6953,310.5,269.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="269.6953" y2="269.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="264.6294">get()</text>
     </a>
     <polygon fill="#A80036" points="187,279.6953,177,283.6953,187,287.6953,183,283.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="283.6953" y2="283.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348.5,293.6953,358.5,297.6953,348.5,301.6953,352.5,297.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="297.6953" y2="297.6953"/>
     </a>
@@ -124,18 +124,18 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="364.5" y1="311.6953" y2="311.6953"/>
     <polygon fill="#A80036" points="91.5,321.6953,81.5,325.6953,91.5,329.6953,87.5,325.6953" 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="170" y1="325.6953" y2="325.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="154,335.6953,164,339.6953,154,343.6953,158,339.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="160" y1="339.6953" y2="339.6953"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="306.5,364.8281,316.5,368.8281,306.5,372.8281,310.5,368.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="312.5" y1="368.8281" y2="368.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="183" y="363.7622">get()</text>
     </a>
     <polygon fill="#A80036" points="187,378.8281,177,382.8281,187,386.8281,183,382.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="322.5" y1="382.8281" y2="382.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20037/t20037.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348.5,392.8281,358.5,396.8281,348.5,400.8281,352.5,396.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176" x2="354.5" y1="396.8281" y2="396.8281"/>
     </a>
diff --git a/docs/test_cases/t20038.md b/docs/test_cases/t20038.md
index babaeeb1..30bc51d2 100644
--- a/docs/test_cases/t20038.md
+++ b/docs/test_cases/t20038.md
@@ -141,6 +141,7 @@ template <typename T> T add(T a, T b)
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20038::tmain()",
       "id": "1013610625329227974",
       "name": "tmain",
       "namespace": "clanguml::t20038",
@@ -156,6 +157,7 @@ template <typename T> T add(T a, T b)
       "activities": [
         {
           "display_name": "b()",
+          "full_name": "clanguml::t20038::B::b()",
           "id": "690314603725772987",
           "name": "b",
           "namespace": "",
@@ -169,6 +171,7 @@ template <typename T> T add(T a, T b)
         },
         {
           "display_name": "bbb()",
+          "full_name": "clanguml::t20038::B::bbb()",
           "id": "1902331999195245434",
           "name": "bbb",
           "namespace": "",
@@ -182,6 +185,7 @@ template <typename T> T add(T a, T b)
         },
         {
           "display_name": "bbbb()",
+          "full_name": "clanguml::t20038::B::bbbb()",
           "id": "57189865474209187",
           "name": "bbbb",
           "namespace": "",
@@ -195,6 +199,7 @@ template <typename T> T add(T a, T b)
         },
         {
           "display_name": "wrap(int)",
+          "full_name": "clanguml::t20038::B::wrap(int)",
           "id": "732774941205637034",
           "name": "wrap",
           "namespace": "",
@@ -208,6 +213,7 @@ template <typename T> T add(T a, T b)
         },
         {
           "display_name": "bbbbb()",
+          "full_name": "clanguml::t20038::B::bbbbb()",
           "id": "726295067786650864",
           "name": "bbbbb",
           "namespace": "",
@@ -221,6 +227,7 @@ template <typename T> T add(T a, T b)
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20038::B",
       "id": "1040787777721396414",
       "name": "B",
       "namespace": "clanguml::t20038",
@@ -236,6 +243,7 @@ template <typename T> T add(T a, T b)
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20038::A::a()",
           "id": "1311298747919334371",
           "name": "a",
           "namespace": "",
@@ -249,6 +257,7 @@ template <typename T> T add(T a, T b)
         },
         {
           "display_name": "aaa()",
+          "full_name": "clanguml::t20038::A::aaa()",
           "id": "2157208254318041144",
           "name": "aaa",
           "namespace": "",
@@ -262,6 +271,7 @@ template <typename T> T add(T a, T b)
         },
         {
           "display_name": "aaaa()",
+          "full_name": "clanguml::t20038::A::aaaa()",
           "id": "1370854824770046153",
           "name": "aaaa",
           "namespace": "",
@@ -275,6 +285,7 @@ template <typename T> T add(T a, T b)
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20038::A",
       "id": "2022724814881480995",
       "name": "A",
       "namespace": "clanguml::t20038",
@@ -288,6 +299,7 @@ template <typename T> T add(T a, T b)
     },
     {
       "display_name": "add<int>(int,int)",
+      "full_name": "clanguml::t20038::add<int>(int,int)",
       "id": "2008308445790932614",
       "name": "add",
       "namespace": "clanguml::t20038",
@@ -301,6 +313,7 @@ template <typename T> T add(T a, T b)
     },
     {
       "display_name": "add_impl<int>(int,int)",
+      "full_name": "clanguml::t20038::add_impl<int>(int,int)",
       "id": "1863007445376981099",
       "name": "add_impl",
       "namespace": "clanguml::t20038",
@@ -314,6 +327,7 @@ template <typename T> T add(T a, T b)
     },
     {
       "display_name": "add_impl<double>(double,double)",
+      "full_name": "clanguml::t20038::add_impl<double>(double,double)",
       "id": "1722521509166427875",
       "name": "add_impl",
       "namespace": "clanguml::t20038",
@@ -406,6 +420,26 @@ template <typename T> T add(T a, T b)
                     "participant_id": "1040787777721396414"
                   },
                   "type": "message"
+                },
+                {
+                  "from": {
+                    "activity_id": "690314603725772987",
+                    "participant_id": "1040787777721396414"
+                  },
+                  "name": "a()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "column": 22,
+                    "file": "t20038.cc",
+                    "line": 29,
+                    "translation_unit": "t20038.cc"
+                  },
+                  "to": {
+                    "activity_id": "1311298747919334371",
+                    "participant_id": "2022724814881480995"
+                  },
+                  "type": "message"
                 }
               ],
               "type": "alternative"
@@ -617,6 +651,46 @@ template <typename T> T add(T a, T b)
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "1370854824770046153",
+            "participant_id": "2022724814881480995"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "column": 25,
+            "file": "t20038.cc",
+            "line": 23,
+            "translation_unit": "t20038.cc"
+          },
+          "to": {
+            "activity_id": "2008308445790932614",
+            "participant_id": "2008308445790932614"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2008308445790932614",
+            "participant_id": "2008308445790932614"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "column": 12,
+            "file": "include/t20038.h",
+            "line": 11,
+            "translation_unit": "t20038.cc"
+          },
+          "to": {
+            "activity_id": "1863007445376981099",
+            "participant_id": "1863007445376981099"
+          },
+          "type": "message"
+        },
         {
           "activity_id": "1013610625329227974",
           "branches": [
@@ -642,6 +716,26 @@ template <typename T> T add(T a, T b)
                     "participant_id": "1040787777721396414"
                   },
                   "type": "message"
+                },
+                {
+                  "from": {
+                    "activity_id": "1902331999195245434",
+                    "participant_id": "1040787777721396414"
+                  },
+                  "name": "aaa()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "column": 24,
+                    "file": "t20038.cc",
+                    "line": 33,
+                    "translation_unit": "t20038.cc"
+                  },
+                  "to": {
+                    "activity_id": "2157208254318041144",
+                    "participant_id": "2022724814881480995"
+                  },
+                  "type": "message"
                 }
               ],
               "type": "consequent"
diff --git a/docs/test_cases/t20038_sequence.svg b/docs/test_cases/t20038_sequence.svg
index 41c9fa0f..914de531 100644
--- a/docs/test_cases/t20038_sequence.svg
+++ b/docs/test_cases/t20038_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="1391px" preserveAspectRatio="none" style="width:917px;height:1391px;" version="1.1" viewBox="0 0 917 1391" width="917px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1p0jom4wetzq1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10bb15x1vjcex" 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,29 +9,29 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="1292.7813" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="872.8828"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1022.2813"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1266.9453"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1051.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1296.0781"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1065.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="733.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1079.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="940.0156"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="1292.7813" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="872.8828"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1022.2813"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1266.9453"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1051.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1296.0781"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1065.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="733.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1079.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="940.0156"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
     <rect fill="#FFFFFF" height="127.3984" style="stroke: none; stroke-width: 1.0;" width="266.5" x="72" y="434.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="144.5313" style="stroke: #000000; stroke-width: 2.0;" width="293.5" x="35" y="1189.5469"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="144.5313" style="stroke: #000000; stroke-width: 2.0;" width="293.5" x="35" y="1189.5469"/>
     <rect fill="#FFFFFF" height="2" style="stroke: none; stroke-width: 1.0;" width="293.5" x="35" y="1332.0781"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="149" x2="149" y1="38.2969" y2="1351.0781"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="234" x2="234" y1="38.2969" y2="1351.0781"/>
@@ -39,62 +39,62 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="394.5" x2="394.5" y1="38.2969" y2="1351.0781"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="555.5" x2="555.5" y1="38.2969" y2="1351.0781"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="779.5" x2="779.5" y1="38.2969" y2="1351.0781"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L44" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L44" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="1350.0781"/>
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="116" y="1350.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="123" y="1370.0732">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="1350.0781"/>
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="220" y="1350.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="227" y="1370.0732">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="1350.0781"/>
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="291.5" y="1350.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="298.5" y="1370.0732">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L8" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L8" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="22.9951">add&lt;int&gt;(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="1350.0781"/>
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="328.5" y="1350.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="335.5" y="1370.0732">add&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="22.9951">add_impl&lt;int&gt;(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="1350.0781"/>
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="164" x="471.5" y="1350.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="150" x="478.5" y="1370.0732">add_impl&lt;int&gt;(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L6" target="_top" title="add_impl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L6" xlink:show="new" xlink:title="add_impl" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="22.9951">add_impl&lt;double&gt;(double,double)</text>
-      <rect fill="#FEFECE" filter="url(#f1p0jom4wetzq1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="1350.0781"/>
+      <rect fill="#FEFECE" filter="url(#f10bb15x1vjcex)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="649.5" y="1350.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="243" x="656.5" y="1370.0732">add_impl&lt;double&gt;(double,double)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="1292.7813" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="872.8828"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1022.2813"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1266.9453"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1051.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1296.0781"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1065.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="733.4844"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1079.4141"/>
-    <rect fill="#FFFFFF" filter="url(#f1p0jom4wetzq1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="940.0156"/>
-    <path d="M8,53.2969 L8,244.2969 L286,244.2969 L286,63.2969 L276,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="1292.7813" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="144" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="362.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="496.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="590.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="676.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="872.8828"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="113.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1022.2813"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="229" y="1266.9453"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="391.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="525.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="619.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="705.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1051.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="300" y="1296.0781"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="719.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390" y="1065.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="733.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="550.5" y="1079.4141"/>
+    <rect fill="#FFFFFF" filter="url(#f10bb15x1vjcex)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="940.0156"/>
+    <path d="M8,53.2969 L8,244.2969 L286,244.2969 L286,63.2969 L276,53.2969 L8,53.2969 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M276,53.2969 L276,63.2969 L286,63.2969 L276,53.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="253" x="14" y="70.3638">Nisl purus in mollis nunc sed id semper.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="220" x="14" y="85.4966">Varius vel pharetra vel turpis. Arcu</text>
@@ -111,18 +111,18 @@
     <path d="M72,260.8906 L136,260.8906 L136,267.8906 L126,277.8906 L72,277.8906 L72,260.8906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="301.0625" style="stroke: #000000; stroke-width: 2.0;" width="266.5" x="72" y="260.8906"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="87" y="273.9575">alt</text>
-    <path d="M82,283.0234 L82,308.0234 L212,308.0234 L212,293.0234 L202,283.0234 L82,283.0234 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M82,283.0234 L82,308.0234 L212,308.0234 L212,293.0234 L202,283.0234 L82,283.0234 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M202,283.0234 L202,293.0234 L212,293.0234 L202,283.0234 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="109" x="88" y="300.0903">Repeat 5 times...</text>
     <path d="M106,324.1563 L183,324.1563 L183,331.1563 L173,341.1563 L106,341.1563 L106,324.1563 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="103.3984" style="stroke: #000000; stroke-width: 2.0;" width="222.5" x="106" y="324.1563"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="121" y="337.2231">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,358.4219,227,362.4219,217,366.4219,221,362.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="362.4219" y2="362.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="357.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,387.5547,298,391.5547,288,395.5547,292,391.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="391.5547" y2="391.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="386.4888">a()</text>
@@ -132,15 +132,15 @@
     <polygon fill="#A80036" points="165,415.5547,155,419.5547,165,423.5547,161,419.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="419.5547" y2="419.5547"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="72" x2="338.5" y1="435.5547" y2="435.5547"/>
-    <path d="M91,441.5547 L91,466.5547 L203,466.5547 L203,451.5547 L193,441.5547 L91,441.5547 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M91,441.5547 L91,466.5547 L203,466.5547 L203,451.5547 L193,441.5547 L91,441.5547 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M193,441.5547 L193,451.5547 L203,451.5547 L193,441.5547 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="91" x="97" y="458.6216">... or just once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,492.8203,227,496.8203,217,500.8203,221,496.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="496.8203" y2="496.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="161" y="491.7544">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,521.9531,298,525.9531,288,529.9531,292,525.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="525.9531" y2="525.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="246" y="520.8872">a()</text>
@@ -149,12 +149,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="539.9531" y2="539.9531"/>
     <polygon fill="#A80036" points="165,549.9531,155,553.9531,165,557.9531,161,553.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="553.9531" y2="553.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,586.0859,227,590.0859,217,594.0859,221,590.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="590.0859" y2="590.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="161" y="585.02">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,615.2188,298,619.2188,288,623.2188,292,619.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="619.2188" y2="619.2188"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="614.1528">aaa()</text>
@@ -163,21 +163,21 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="633.2188" y2="633.2188"/>
     <polygon fill="#A80036" points="165,643.2188,155,647.2188,165,651.2188,161,647.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="647.2188" y2="647.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,672.3516,227,676.3516,217,680.3516,221,676.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="676.3516" y2="676.3516"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="161" y="671.2856">bbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,701.4844,298,705.4844,288,709.4844,292,705.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="705.4844" y2="705.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="700.4185">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="378,715.4844,388,719.4844,378,723.4844,382,719.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="719.4844" y2="719.4844"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="538.5,729.4844,548.5,733.4844,538.5,737.4844,542.5,733.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="733.4844" y2="733.4844"/>
     </a>
@@ -189,44 +189,44 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="775.4844" y2="775.4844"/>
     <polygon fill="#A80036" points="165,785.4844,155,789.4844,165,793.4844,161,789.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="789.4844" y2="789.4844"/>
-    <path d="M12,802.4844 L12,842.4844 L282,842.4844 L282,812.4844 L272,802.4844 L12,802.4844 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M12,802.4844 L12,842.4844 L282,842.4844 L282,812.4844 L272,802.4844 L12,802.4844 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M272,802.4844 L272,812.4844 L282,812.4844 L272,802.4844 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="249" x="18" y="819.5513">This comment should be rendered only</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="18" y="834.6841">once</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L77" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L77" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,868.8828,227,872.8828,217,876.8828,221,872.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="872.8828" y2="872.8828"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="56" x="161" y="867.8169">wrap(int)</text>
     </a>
     <polygon fill="#A80036" points="165,882.8828,155,886.8828,165,890.8828,161,886.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="886.8828" y2="886.8828"/>
-    <path d="M90,899.8828 L90,924.8828 L203,924.8828 L203,909.8828 L193,899.8828 L90,899.8828 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M90,899.8828 L90,924.8828 L203,924.8828 L203,909.8828 L193,899.8828 L90,899.8828 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M193,899.8828 L193,909.8828 L203,909.8828 L193,899.8828 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="92" x="96" y="916.9497">What is 2 + 2?</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L79" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L79" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,936.0156,773,940.0156,763,944.0156,767,940.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="769" y1="940.0156" y2="940.0156"/>
     </a>
     <polygon fill="#A80036" points="165,950.0156,155,954.0156,165,958.0156,161,954.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="779" y1="954.0156" y2="954.0156"/>
-    <path d="M80,967.0156 L80,992.0156 L214,992.0156 L214,977.0156 L204,967.0156 L80,967.0156 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M80,967.0156 L80,992.0156 L214,992.0156 L214,977.0156 L204,967.0156 L80,967.0156 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M204,967.0156 L204,977.0156 L214,977.0156 L204,967.0156 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="113" x="86" y="984.0825">Calling B::bbbbb()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,1018.2813,227,1022.2813,217,1026.2813,221,1022.2813" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1022.2813" y2="1022.2813"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="161" y="1017.2153">bbbbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,1047.4141,298,1051.4141,288,1055.4141,292,1051.4141" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1051.4141" y2="1051.4141"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="246" y="1046.3481">aaaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="378,1061.4141,388,1065.4141,378,1069.4141,382,1065.4141" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="310" x2="384" y1="1065.4141" y2="1065.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/include/t20038.h#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="538.5,1075.4141,548.5,1079.4141,538.5,1083.4141,542.5,1079.4141" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="544.5" y1="1079.4141" y2="1079.4141"/>
     </a>
@@ -238,23 +238,23 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="244" x2="304" y1="1121.4141" y2="1121.4141"/>
     <polygon fill="#A80036" points="165,1131.4141,155,1135.4141,165,1139.4141,161,1135.4141" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="159" x2="233" y1="1135.4141" y2="1135.4141"/>
-    <path d="M45,1148.4141 L45,1173.4141 L249,1173.4141 L249,1158.4141 L239,1148.4141 L45,1148.4141 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M45,1148.4141 L45,1173.4141 L249,1173.4141 L249,1158.4141 L239,1148.4141 L45,1148.4141 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M239,1148.4141 L239,1158.4141 L249,1158.4141 L239,1148.4141 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="183" x="51" y="1165.481">This is a conditional operator</text>
     <path d="M35,1189.5469 L99,1189.5469 L99,1196.5469 L89,1206.5469 L35,1206.5469 L35,1189.5469 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="144.5313" style="stroke: #000000; stroke-width: 2.0;" width="293.5" x="35" y="1189.5469"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="50" y="1202.6138">alt</text>
-    <path d="M45,1211.6797 L45,1236.6797 L249,1236.6797 L249,1221.6797 L239,1211.6797 L45,1211.6797 " fill="#FBFB77" filter="url(#f1p0jom4wetzq1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M45,1211.6797 L45,1236.6797 L249,1236.6797 L249,1221.6797 L239,1211.6797 L45,1211.6797 " fill="#FBFB77" filter="url(#f10bb15x1vjcex)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M239,1211.6797 L239,1221.6797 L249,1221.6797 L239,1211.6797 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="183" x="51" y="1228.7466">This is a conditional operator</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="217,1262.9453,227,1266.9453,217,1270.9453,221,1266.9453" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154" x2="223" y1="1266.9453" y2="1266.9453"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="161" y="1261.8794">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="167" y="1261.8794">bbb()</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="201" y="1261.8794">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20038/t20038.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288,1292.0781,298,1296.0781,288,1300.0781,292,1296.0781" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239" x2="294" y1="1296.0781" y2="1296.0781"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="246" y="1291.0122">aaa()</text>
diff --git a/docs/test_cases/t20039.md b/docs/test_cases/t20039.md
index 14b0b4ef..a6b9e2a4 100644
--- a/docs/test_cases/t20039.md
+++ b/docs/test_cases/t20039.md
@@ -72,6 +72,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20039::tmain()",
       "id": "2148451609276010605",
       "name": "tmain",
       "namespace": "clanguml::t20039",
@@ -87,6 +88,7 @@ int tmain()
       "activities": [
         {
           "display_name": "run()",
+          "full_name": "clanguml::t20039::R::run()",
           "id": "743095879760855186",
           "name": "run",
           "namespace": "",
@@ -100,6 +102,7 @@ int tmain()
         }
       ],
       "display_name": "R",
+      "full_name": "clanguml::t20039::R",
       "id": "911510236910860394",
       "name": "R",
       "namespace": "clanguml::t20039",
@@ -115,6 +118,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a(int)",
+          "full_name": "clanguml::t20039::A<int>::a(int)",
           "id": "1669283381205253105",
           "name": "a",
           "namespace": "",
@@ -128,6 +132,7 @@ int tmain()
         }
       ],
       "display_name": "A<int>",
+      "full_name": "clanguml::t20039::A<int>",
       "id": "1909240382008619079",
       "name": "A",
       "namespace": "clanguml::t20039",
@@ -143,6 +148,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a(int_vec_t)",
+          "full_name": "clanguml::t20039::A<int_vec_t>::a(int_vec_t)",
           "id": "102043386959871430",
           "name": "a",
           "namespace": "",
@@ -156,6 +162,7 @@ int tmain()
         }
       ],
       "display_name": "A<int_vec_t>",
+      "full_name": "clanguml::t20039::A<int_vec_t>",
       "id": "2044714081517303079",
       "name": "A",
       "namespace": "clanguml::t20039",
@@ -171,6 +178,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a(string_vec_t)",
+          "full_name": "clanguml::t20039::A<string_vec_t>::a(string_vec_t)",
           "id": "877375915521239216",
           "name": "a",
           "namespace": "",
@@ -184,6 +192,7 @@ int tmain()
         }
       ],
       "display_name": "A<string_vec_t>",
+      "full_name": "clanguml::t20039::A<string_vec_t>",
       "id": "985421674263139595",
       "name": "A",
       "namespace": "clanguml::t20039",
@@ -199,6 +208,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a(int_map_t)",
+          "full_name": "clanguml::t20039::A<int_map_t>::a(int_map_t)",
           "id": "720393008985738554",
           "name": "a",
           "namespace": "",
@@ -212,6 +222,7 @@ int tmain()
         }
       ],
       "display_name": "A<int_map_t>",
+      "full_name": "clanguml::t20039::A<int_map_t>",
       "id": "1577435969137543418",
       "name": "A",
       "namespace": "clanguml::t20039",
@@ -227,6 +238,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a(string_map_t)",
+          "full_name": "clanguml::t20039::A<string_map_t>::a(string_map_t)",
           "id": "1228686762653429102",
           "name": "a",
           "namespace": "",
@@ -240,6 +252,7 @@ int tmain()
         }
       ],
       "display_name": "A<string_map_t>",
+      "full_name": "clanguml::t20039::A<string_map_t>",
       "id": "1410668113085504962",
       "name": "A",
       "namespace": "clanguml::t20039",
@@ -281,7 +294,7 @@ int tmain()
             "participant_id": "911510236910860394"
           },
           "name": "a(int)",
-          "return_type": "std::vector<std::vector<int>>",
+          "return_type": "std::vector<int_vec_t>",
           "scope": "normal",
           "source_location": {
             "column": 9,
diff --git a/docs/test_cases/t20039_sequence.svg b/docs/test_cases/t20039_sequence.svg
index 499d2998..7f419259 100644
--- a/docs/test_cases/t20039_sequence.svg
+++ b/docs/test_cases/t20039_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="343px" preserveAspectRatio="none" style="width:745px;height:343px;" version="1.1" viewBox="0 0 745 343" width="745px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ftu5px83zg1dm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18s2isaqvd0sg" 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(#ftu5px83zg1dm)" height="236.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="215.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="96" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="159" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="258.5" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="525.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="663.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="236.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="215.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="96" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="159" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="258.5" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="525.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="663.5" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="303.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="101" x2="101" y1="38.2969" y2="303.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="164" x2="164" y1="38.2969" y2="303.0938"/>
@@ -23,89 +23,89 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="395" x2="395" y1="38.2969" y2="303.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="530" x2="530" y1="38.2969" y2="303.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="668" x2="668" y1="38.2969" y2="303.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" 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(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="302.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="302.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="322.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L12" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L12" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="87" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L12" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L12" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="87" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="94" y="22.9951">R</text>
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="87" y="302.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="87" y="302.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="94" y="322.0889">R</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="130" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="130" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="137" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="130" y="302.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="130" y="302.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="137" y="322.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="208" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="208" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="93" x="215" y="22.9951">A&lt;int_vec_t&gt;</text>
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="208" y="302.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="208" y="302.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="93" x="215" y="322.0889">A&lt;int_vec_t&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="329" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="329" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="336" y="22.9951">A&lt;string_vec_t&gt;</text>
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="329" y="302.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="329" y="302.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="115" x="336" y="322.0889">A&lt;string_vec_t&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="472" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="472" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="479" y="22.9951">A&lt;int_map_t&gt;</text>
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="472" y="302.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="472" y="302.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="479" y="322.0889">A&lt;int_map_t&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="599" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="599" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="121" x="606" y="22.9951">A&lt;string_map_t&gt;</text>
-      <rect fill="#FEFECE" filter="url(#ftu5px83zg1dm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="599" y="302.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18s2isaqvd0sg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="599" y="302.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="121" x="606" y="322.0889">A&lt;string_map_t&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="236.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="215.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="96" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="159" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="258.5" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="525.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#ftu5px83zg1dm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="663.5" y="271.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="236.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="215.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="96" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="159" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="258.5" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="390.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="525.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f18s2isaqvd0sg)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="663.5" y="271.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="84,65.4297,94,69.4297,84,73.4297,88,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="90" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="53" y="64.3638">run()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="147,94.5625,157,98.5625,147,102.5625,151,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="153" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="113" y="93.4966">a(int)</text>
     </a>
     <polygon fill="#A80036" points="117,108.5625,107,112.5625,117,116.5625,113,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="111" x2="163" y1="112.5625" y2="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="246.5,137.6953,256.5,141.6953,246.5,145.6953,250.5,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="252.5" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="113" y="136.6294">a(int_vec_t)</text>
     </a>
     <polygon fill="#A80036" points="117,151.6953,107,155.6953,117,159.6953,113,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="111" x2="262.5" y1="155.6953" y2="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="378.5,180.8281,388.5,184.8281,378.5,188.8281,382.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="384.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="113" y="179.7622">a(string_vec_t)</text>
     </a>
     <polygon fill="#A80036" points="117,194.8281,107,198.8281,117,202.8281,113,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="111" x2="394.5" y1="198.8281" y2="198.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="513.5,223.9609,523.5,227.9609,513.5,231.9609,517.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="519.5" y1="227.9609" y2="227.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="113" y="222.895">a(int_map_t)</text>
     </a>
     <polygon fill="#A80036" points="117,237.9609,107,241.9609,117,245.9609,113,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="111" x2="529.5" y1="241.9609" y2="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20039/t20039.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20039/t20039.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="651.5,267.0938,661.5,271.0938,651.5,275.0938,655.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="106" x2="657.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="102" x="113" y="266.0278">a(string_map_t)</text>
diff --git a/docs/test_cases/t20040.md b/docs/test_cases/t20040.md
index 2dadfaaf..65ed54af 100644
--- a/docs/test_cases/t20040.md
+++ b/docs/test_cases/t20040.md
@@ -57,6 +57,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20040::tmain()",
       "id": "998622560147459663",
       "name": "tmain",
       "namespace": "clanguml::t20040",
@@ -69,7 +70,8 @@ void tmain()
       "type": "function"
     },
     {
-      "display_name": "print<int,double,std::string>(int,double,std::basic_string<char>)",
+      "display_name": "print<int,double,std::string>(int,double,std::string)",
+      "full_name": "clanguml::t20040::print<int,double,std::string>(int,double,std::basic_string<char>)",
       "id": "466846361794024298",
       "name": "print",
       "namespace": "clanguml::t20040",
@@ -82,7 +84,8 @@ void tmain()
       "type": "function_template"
     },
     {
-      "display_name": "print<double,std::string>(double,std::basic_string<char>)",
+      "display_name": "print<double,std::string>(double,std::string)",
+      "full_name": "clanguml::t20040::print<double,std::string>(double,std::basic_string<char>)",
       "id": "1387681712381484036",
       "name": "print",
       "namespace": "clanguml::t20040",
@@ -95,7 +98,8 @@ void tmain()
       "type": "function_template"
     },
     {
-      "display_name": "print<std::string>(std::basic_string<char>)",
+      "display_name": "print<std::string>(std::string)",
+      "full_name": "clanguml::t20040::print<std::string>(std::basic_string<char>)",
       "id": "1353926867284821849",
       "name": "print",
       "namespace": "clanguml::t20040",
@@ -109,6 +113,7 @@ void tmain()
     },
     {
       "display_name": "print()",
+      "full_name": "clanguml::t20040::print()",
       "id": "245418438894072749",
       "name": "print",
       "namespace": "clanguml::t20040",
@@ -121,7 +126,8 @@ void tmain()
       "type": "function"
     },
     {
-      "display_name": "doublePrint<std::string,int>(std::basic_string<char>,int)",
+      "display_name": "doublePrint<std::string,int>(std::string,int)",
+      "full_name": "clanguml::t20040::doublePrint<std::string,int>(std::basic_string<char>,int)",
       "id": "2024126405552345351",
       "name": "doublePrint",
       "namespace": "clanguml::t20040",
@@ -134,7 +140,8 @@ void tmain()
       "type": "function_template"
     },
     {
-      "display_name": "print<std::string,int>(std::basic_string<char>,int)",
+      "display_name": "print<std::string,int>(std::string,int)",
+      "full_name": "clanguml::t20040::print<std::string,int>(std::basic_string<char>,int)",
       "id": "1349996183789322606",
       "name": "print",
       "namespace": "clanguml::t20040",
@@ -148,6 +155,7 @@ void tmain()
     },
     {
       "display_name": "print<int>(int)",
+      "full_name": "clanguml::t20040::print<int>(int)",
       "id": "1189427464789523930",
       "name": "print",
       "namespace": "clanguml::t20040",
diff --git a/docs/test_cases/t20040_sequence.svg b/docs/test_cases/t20040_sequence.svg
index d19c8a2c..501a7eac 100644
--- a/docs/test_cases/t20040_sequence.svg
+++ b/docs/test_cases/t20040_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="270px" preserveAspectRatio="none" style="width:1834px;height:270px;" version="1.1" viewBox="0 0 1834 270" width="1834px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7yoxfz04qszx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18pse0l2u3qmp" 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,15 +9,15 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="164" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="264.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="624.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="911.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="182.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1260.5" y="140.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1561.5" y="154.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1763.5" y="168.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="164" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="264.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="624.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="911.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="182.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1260.5" y="140.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1561.5" y="154.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1763.5" y="168.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="230.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="269" x2="269" y1="38.2969" y2="230.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="629" x2="629" y1="38.2969" y2="230.2969"/>
@@ -26,92 +26,92 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1265" x2="1265" y1="38.2969" y2="230.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1566" x2="1566" y1="38.2969" y2="230.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1768" x2="1768" y1="38.2969" y2="230.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L19" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L19" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L19" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L19" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" 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(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="249.292">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="367" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="367" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="353" x="91" y="22.9951">print&lt;int,double,std::string&gt;(int,double,std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="367" x="84" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="367" x="84" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="353" x="91" y="249.292">print&lt;int,double,std::string&gt;(int,double,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="325" x="465" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="325" x="465" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="311" x="472" y="22.9951">print&lt;double,std::string&gt;(double,std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="325" x="465" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="325" x="465" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="311" x="472" y="249.292">print&lt;double,std::string&gt;(double,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="221" x="804" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="221" x="804" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="207" x="811" y="22.9951">print&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="221" x="804" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="221" x="804" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="207" x="811" y="249.292">print&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L6" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L6" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="1039" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L6" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L6" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="1039" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="41" x="1046" y="22.9951">print()</text>
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="1039" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="1039" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="41" x="1046" y="249.292">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L14" target="_top" title="doublePrint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L14" xlink:show="new" xlink:title="doublePrint" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="311" x="1108" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L14" target="_top" title="doublePrint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L14" xlink:show="new" xlink:title="doublePrint" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="311" x="1108" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="297" x="1115" y="22.9951">doublePrint&lt;std::string,int&gt;(std::string,int)</text>
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="311" x="1108" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="311" x="1108" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="297" x="1115" y="249.292">doublePrint&lt;std::string,int&gt;(std::string,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="263" x="1433" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="263" x="1433" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="249" x="1440" y="22.9951">print&lt;std::string,int&gt;(std::string,int)</text>
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="263" x="1433" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="263" x="1433" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="249" x="1440" y="249.292">print&lt;std::string,int&gt;(std::string,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="1710" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L8" xlink:show="new" xlink:title="print" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="1710" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="1717" y="22.9951">print&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f7yoxfz04qszx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="1710" y="229.2969"/>
+      <rect fill="#FEFECE" filter="url(#f18pse0l2u3qmp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="113" x="1710" y="229.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="99" x="1717" y="249.292">print&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="164" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="264.5" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="624.5" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="911.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="182.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1260.5" y="140.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1561.5" y="154.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7yoxfz04qszx)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1763.5" y="168.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="164" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="264.5" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="624.5" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="911.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1063.5" y="182.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="72" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1260.5" y="140.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1561.5" y="154.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18pse0l2u3qmp)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1763.5" y="168.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="252.5,50.2969,262.5,54.2969,252.5,58.2969,256.5,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="258.5" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="612.5,64.2969,622.5,68.2969,612.5,72.2969,616.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="274.5" x2="618.5" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="899.5,78.2969,909.5,82.2969,899.5,86.2969,903.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="634.5" x2="905.5" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1051.5,92.2969,1061.5,96.2969,1051.5,100.2969,1055.5,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="921.5" x2="1057.5" y1="96.2969" y2="96.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1248.5,136.2969,1258.5,140.2969,1248.5,144.2969,1252.5,140.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1254.5" y1="140.2969" y2="140.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1549.5,150.2969,1559.5,154.2969,1549.5,158.2969,1553.5,154.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1270.5" x2="1555.5" y1="154.2969" y2="154.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1751.5,164.2969,1761.5,168.2969,1751.5,172.2969,1755.5,168.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1571.5" x2="1757.5" y1="168.2969" y2="168.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20040/t20040.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1084.5,178.2969,1074.5,182.2969,1084.5,186.2969,1080.5,182.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1078.5" x2="1762.5" y1="182.2969" y2="182.2969"/>
     </a>
diff --git a/docs/test_cases/t20041.md b/docs/test_cases/t20041.md
index 2a504842..a1a81c1e 100644
--- a/docs/test_cases/t20041.md
+++ b/docs/test_cases/t20041.md
@@ -60,6 +60,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20041::tmain()",
       "id": "1389566400082670258",
       "name": "tmain",
       "namespace": "clanguml::t20041",
@@ -75,6 +76,7 @@ void tmain()
       "activities": [
         {
           "display_name": "print(int,double,std::string)",
+          "full_name": "clanguml::t20041::A<int,double,std::string>::print(int,double,std::string)",
           "id": "532000038063429229",
           "name": "print",
           "namespace": "",
@@ -88,6 +90,7 @@ void tmain()
         }
       ],
       "display_name": "A<int,double,std::string>",
+      "full_name": "clanguml::t20041::A<int,double,std::string>",
       "id": "832678750316145968",
       "name": "A",
       "namespace": "clanguml::t20041",
@@ -103,6 +106,7 @@ void tmain()
       "activities": [
         {
           "display_name": "print(double,std::string)",
+          "full_name": "clanguml::t20041::A<double,std::string>::print(double,std::string)",
           "id": "1403962403457522629",
           "name": "print",
           "namespace": "",
@@ -116,6 +120,7 @@ void tmain()
         }
       ],
       "display_name": "A<double,std::string>",
+      "full_name": "clanguml::t20041::A<double,std::string>",
       "id": "942399465509044163",
       "name": "A",
       "namespace": "clanguml::t20041",
@@ -131,6 +136,7 @@ void tmain()
       "activities": [
         {
           "display_name": "print(std::string)",
+          "full_name": "clanguml::t20041::A<std::string>::print(std::string)",
           "id": "1658479415048358058",
           "name": "print",
           "namespace": "",
@@ -144,6 +150,7 @@ void tmain()
         }
       ],
       "display_name": "A<std::string>",
+      "full_name": "clanguml::t20041::A<std::string>",
       "id": "1390965848075226081",
       "name": "A",
       "namespace": "clanguml::t20041",
@@ -159,6 +166,7 @@ void tmain()
       "activities": [
         {
           "display_name": "print()",
+          "full_name": "clanguml::t20041::A::print()",
           "id": "1295142493768214222",
           "name": "print",
           "namespace": "",
@@ -172,6 +180,7 @@ void tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20041::A",
       "id": "1052108783247143031",
       "name": "A",
       "namespace": "clanguml::t20041",
diff --git a/docs/test_cases/t20041_sequence.svg b/docs/test_cases/t20041_sequence.svg
index 080eab86..1cd7b267 100644
--- a/docs/test_cases/t20041_sequence.svg
+++ b/docs/test_cases/t20041_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="245px" preserveAspectRatio="none" style="width:697px;height:245px;" version="1.1" viewBox="0 0 697 245" width="697px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fed0c2r84xup8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fuqit2uv226dy" 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,67 +9,67 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="138.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="235" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="429.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="587.5" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="672" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="138.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="235" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="429.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="587.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="672" y="156.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="204.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="239.5" x2="239.5" y1="38.2969" y2="204.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="434.5" x2="434.5" y1="38.2969" y2="204.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="592.5" x2="592.5" y1="38.2969" y2="204.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="676.5" x2="676.5" y1="38.2969" y2="204.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L23" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L23" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L23" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L23" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" 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(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="203.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="203.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="223.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="191" x="142.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="191" x="142.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="177" x="149.5" y="22.9951">A&lt;int,double,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="191" x="142.5" y="203.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="191" x="142.5" y="203.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="177" x="149.5" y="223.8232">A&lt;int,double,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="347.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="347.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="156" x="354.5" y="22.9951">A&lt;double,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="347.5" y="203.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="347.5" y="203.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="156" x="354.5" y="223.8232">A&lt;double,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="531.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="531.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="538.5" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="531.5" y="203.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="531.5" y="203.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="538.5" y="223.8232">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="663.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="663.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="670.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fed0c2r84xup8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="663.5" y="203.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuqit2uv226dy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="663.5" y="203.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="670.5" y="223.8232">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="138.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="235" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="429.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="587.5" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fed0c2r84xup8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="672" y="156.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="138.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="235" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="429.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="587.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuqit2uv226dy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="672" y="156.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="223,65.4297,233,69.4297,223,73.4297,227,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="229" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="170" x="53" y="64.3638">print(int,double,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="417.5,94.5625,427.5,98.5625,417.5,102.5625,421.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="245" x2="423.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="150" x="252" y="93.4966">print(double,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="575.5,123.6953,585.5,127.6953,575.5,131.6953,579.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="439.5" x2="581.5" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="103" x="446.5" y="122.6294">print(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20041/t20041.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20041/t20041.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="660,152.8281,670,156.8281,660,160.8281,664,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="597.5" x2="666" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="39" x="604.5" y="151.7622">print()</text>
diff --git a/docs/test_cases/t20042.md b/docs/test_cases/t20042.md
index 6c5136af..3ee6b46f 100644
--- a/docs/test_cases/t20042.md
+++ b/docs/test_cases/t20042.md
@@ -59,6 +59,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20042::tmain()",
       "id": "609011973422503266",
       "name": "tmain",
       "namespace": "clanguml::t20042",
@@ -74,6 +75,7 @@ void tmain()
       "activities": [
         {
           "display_name": "operator()(A &) const",
+          "full_name": "clanguml::t20042::AHandler::operator()(A &) const",
           "id": "1803150869170812951",
           "name": "operator()",
           "namespace": "",
@@ -87,6 +89,7 @@ void tmain()
         },
         {
           "display_name": "handle(A &) const",
+          "full_name": "clanguml::t20042::AHandler::handle(A &) const",
           "id": "505918958102707204",
           "name": "handle",
           "namespace": "",
@@ -100,6 +103,7 @@ void tmain()
         }
       ],
       "display_name": "AHandler",
+      "full_name": "clanguml::t20042::AHandler",
       "id": "169029708750481998",
       "name": "AHandler",
       "namespace": "clanguml::t20042",
@@ -115,6 +119,7 @@ void tmain()
       "activities": [
         {
           "display_name": "operator()(B &) const",
+          "full_name": "clanguml::t20042::BHandler::operator()(B &) const",
           "id": "1635511505447928279",
           "name": "operator()",
           "namespace": "",
@@ -128,6 +133,7 @@ void tmain()
         },
         {
           "display_name": "handle(B &) const",
+          "full_name": "clanguml::t20042::BHandler::handle(B &) const",
           "id": "869419286648646110",
           "name": "handle",
           "namespace": "",
@@ -141,6 +147,7 @@ void tmain()
         }
       ],
       "display_name": "BHandler",
+      "full_name": "clanguml::t20042::BHandler",
       "id": "1969158228859108037",
       "name": "BHandler",
       "namespace": "clanguml::t20042",
diff --git a/docs/test_cases/t20042_sequence.svg b/docs/test_cases/t20042_sequence.svg
index c8647f61..d4c9fbe9 100644
--- a/docs/test_cases/t20042_sequence.svg
+++ b/docs/test_cases/t20042_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="301px" preserveAspectRatio="none" style="width:493px;height:301px;" version="1.1" viewBox="0 0 493 301" width="493px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffqdqi4ckd6aw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fuywq6e655lzm" 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,55 +9,55 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="187.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="203" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="343" y="170.6953"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="348" y="207.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="187.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="203" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="343" y="170.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="348" y="207.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="260.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="208" x2="208" y1="38.2969" y2="260.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="347.5" x2="347.5" y1="38.2969" y2="260.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffqdqi4ckd6aw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuywq6e655lzm)" 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(#ffqdqi4ckd6aw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="259.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuywq6e655lzm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="259.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="279.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L4" target="_top" title="AHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L4" xlink:show="new" xlink:title="AHandler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffqdqi4ckd6aw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="168" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L4" target="_top" title="AHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L4" xlink:show="new" xlink:title="AHandler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuywq6e655lzm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="168" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="175" y="22.9951">AHandler</text>
-      <rect fill="#FEFECE" filter="url(#ffqdqi4ckd6aw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="168" y="259.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuywq6e655lzm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="168" y="259.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="175" y="279.8232">AHandler</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L10" target="_top" title="BHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L10" xlink:show="new" xlink:title="BHandler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffqdqi4ckd6aw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="307.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L10" target="_top" title="BHandler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L10" xlink:show="new" xlink:title="BHandler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuywq6e655lzm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="307.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="314.5" y="22.9951">BHandler</text>
-      <rect fill="#FEFECE" filter="url(#ffqdqi4ckd6aw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="307.5" y="259.8281"/>
+      <rect fill="#FEFECE" filter="url(#fuywq6e655lzm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="307.5" y="259.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="314.5" y="279.8232">BHandler</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="187.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="203" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="343" y="170.6953"/>
-    <rect fill="#FFFFFF" filter="url(#ffqdqi4ckd6aw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="348" y="207.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="187.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="203" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="65.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="343" y="170.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fuywq6e655lzm)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="348" y="207.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="191,65.4297,201,69.4297,191,73.4297,195,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="197" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="138" x="53" y="64.3638">operator()(A &amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="218" x2="260" y1="98.5625" y2="98.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="260" x2="260" y1="98.5625" y2="111.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="219" x2="260" y1="111.5625" y2="111.5625"/>
       <polygon fill="#A80036" points="229,107.5625,219,111.5625,229,115.5625,225,111.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="116" x="225" y="93.4966">handle(A &amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="331,166.6953,341,170.6953,331,174.6953,335,170.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="337" y1="170.6953" y2="170.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="138" x="53" y="165.6294">operator()(B &amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20042/t20042.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20042/t20042.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="358" x2="400" y1="199.8281" y2="199.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="400" x2="400" y1="199.8281" y2="212.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="359" x2="400" y1="212.8281" y2="212.8281"/>
diff --git a/docs/test_cases/t20043.md b/docs/test_cases/t20043.md
index 3c780e31..6c420471 100644
--- a/docs/test_cases/t20043.md
+++ b/docs/test_cases/t20043.md
@@ -83,6 +83,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20043::tmain()",
       "id": "1396184337601679046",
       "name": "tmain",
       "namespace": "clanguml::t20043",
@@ -98,6 +99,7 @@ int tmain()
       "activities": [
         {
           "display_name": "d()",
+          "full_name": "clanguml::t20043::D::d()",
           "id": "60379393461478854",
           "name": "d",
           "namespace": "",
@@ -111,6 +113,7 @@ int tmain()
         }
       ],
       "display_name": "D",
+      "full_name": "clanguml::t20043::D",
       "id": "1632049250551188852",
       "name": "D",
       "namespace": "clanguml::t20043",
@@ -126,6 +129,7 @@ int tmain()
       "activities": [
         {
           "display_name": "c()",
+          "full_name": "clanguml::t20043::C::c()",
           "id": "998868776840486830",
           "name": "c",
           "namespace": "",
@@ -139,6 +143,7 @@ int tmain()
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20043::C",
       "id": "605388621050971304",
       "name": "C",
       "namespace": "clanguml::t20043",
diff --git a/docs/test_cases/t20043_sequence.svg b/docs/test_cases/t20043_sequence.svg
index d11e50c6..8aa24f56 100644
--- a/docs/test_cases/t20043_sequence.svg
+++ b/docs/test_cases/t20043_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="184px" preserveAspectRatio="none" style="width:165px;height:184px;" version="1.1" viewBox="0 0 165 184" width="165px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fv84mc41x58be" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpbesps3e2zx4" 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(#fv84mc41x58be)" height="78.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fv84mc41x58be)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="93.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fv84mc41x58be)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fpbesps3e2zx4)" height="78.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fpbesps3e2zx4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="93.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fpbesps3e2zx4)" height="14" 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="144.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="98" x2="98" y1="38.2969" y2="144.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="144.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L37" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L37" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv84mc41x58be)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L37" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L37" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpbesps3e2zx4)" 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(#fv84mc41x58be)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="143.5625"/>
+      <rect fill="#FEFECE" filter="url(#fpbesps3e2zx4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="143.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="163.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv84mc41x58be)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpbesps3e2zx4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="91" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#fv84mc41x58be)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="84" y="143.5625"/>
+      <rect fill="#FEFECE" filter="url(#fpbesps3e2zx4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="84" y="143.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="91" y="163.5576">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv84mc41x58be)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fpbesps3e2zx4)" 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">C</text>
-      <rect fill="#FEFECE" filter="url(#fv84mc41x58be)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="143.5625"/>
+      <rect fill="#FEFECE" filter="url(#fpbesps3e2zx4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="143.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="137.5" y="163.5576">C</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fv84mc41x58be)" height="78.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fv84mc41x58be)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="93.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fv84mc41x58be)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fpbesps3e2zx4)" height="78.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fpbesps3e2zx4)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="93.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fpbesps3e2zx4)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="81.5,65.4297,91.5,69.4297,81.5,73.4297,85.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="87.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">d()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20043/t20043.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20043/t20043.cc#L29" 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="103.5" x2="133.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="110.5" y="93.4966">c()</text>
diff --git a/docs/test_cases/t20044.md b/docs/test_cases/t20044.md
index ef55e192..4a7d6d5b 100644
--- a/docs/test_cases/t20044.md
+++ b/docs/test_cases/t20044.md
@@ -9,7 +9,7 @@ diagrams:
     glob:
       - t20044.cc
     type_aliases:
-      "detail::expected<int,error>": result_t
+      "clanguml::t20044::detail::expected<int,clanguml::t20044::error>": result_t
     generate_message_comments: true
     include:
       namespaces:
@@ -137,6 +137,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20044::tmain()",
       "id": "252888248193934644",
       "name": "tmain",
       "namespace": "clanguml::t20044",
@@ -152,6 +153,7 @@ int tmain()
       "activities": [
         {
           "display_name": "R((lambda at t20044.cc:74:9) &&)",
+          "full_name": "clanguml::t20044::R::R((lambda at t20044.cc:74:9) &&)",
           "id": "2121949343931231437",
           "name": "R",
           "namespace": "",
@@ -165,6 +167,7 @@ int tmain()
         }
       ],
       "display_name": "R",
+      "full_name": "clanguml::t20044::R",
       "id": "1556111147598935846",
       "name": "R",
       "namespace": "clanguml::t20044",
@@ -180,6 +183,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()() const",
+          "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:74:9)::operator()() const",
           "id": "818357152220364831",
           "name": "operator()",
           "namespace": "",
@@ -187,6 +191,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20044.cc:74:9)",
+      "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:74:9)",
       "id": "731168008522991712",
       "name": "tmain()::(lambda t20044.cc:74:9)",
       "namespace": "clanguml::t20044",
@@ -202,6 +207,7 @@ int tmain()
       "activities": [
         {
           "display_name": "a() const",
+          "full_name": "clanguml::t20044::A::a() const",
           "id": "853950074322224524",
           "name": "a",
           "namespace": "",
@@ -215,6 +221,7 @@ int tmain()
         },
         {
           "display_name": "a5()",
+          "full_name": "clanguml::t20044::A::a5()",
           "id": "1743691164520385657",
           "name": "a5",
           "namespace": "",
@@ -228,6 +235,7 @@ int tmain()
         },
         {
           "display_name": "a1() const",
+          "full_name": "clanguml::t20044::A::a1() const",
           "id": "701399225037526851",
           "name": "a1",
           "namespace": "",
@@ -241,6 +249,7 @@ int tmain()
         },
         {
           "display_name": "a2(int) const",
+          "full_name": "clanguml::t20044::A::a2(int) const",
           "id": "85144570008244024",
           "name": "a2",
           "namespace": "",
@@ -254,6 +263,7 @@ int tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20044::A",
       "id": "1026615617828083132",
       "name": "A",
       "namespace": "clanguml::t20044",
@@ -269,6 +279,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()() const",
+          "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:84:18)::operator()() const",
           "id": "436096372302626180",
           "name": "operator()",
           "namespace": "",
@@ -276,6 +287,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20044.cc:84:18)",
+      "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:84:18)",
       "id": "1462639563075674191",
       "name": "tmain()::(lambda t20044.cc:84:18)",
       "namespace": "clanguml::t20044",
@@ -291,6 +303,7 @@ int tmain()
       "activities": [
         {
           "display_name": "expected(int)",
+          "full_name": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>::expected(int)",
           "id": "1539466150622485129",
           "name": "expected",
           "namespace": "",
@@ -304,6 +317,7 @@ int tmain()
         },
         {
           "display_name": "and_then((lambda at t20044.cc:90:19) &&)",
+          "full_name": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>::and_then((lambda at t20044.cc:90:19) &&)",
           "id": "377073498530267347",
           "name": "and_then",
           "namespace": "",
@@ -316,8 +330,9 @@ int tmain()
           "type": "method"
         },
         {
-          "display_name": "and_then(detail::expected<int,error> (&)(int))",
-          "id": "688251630893467966",
+          "display_name": "and_then(result_t (&)(int))",
+          "full_name": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>::and_then(result_t (&)(int))",
+          "id": "1974891758151777473",
           "name": "and_then",
           "namespace": "",
           "source_location": {
@@ -329,8 +344,9 @@ int tmain()
           "type": "method"
         },
         {
-          "display_name": "and_then(std::function<detail::expected<int,error> (int)> &)",
-          "id": "139031379616853201",
+          "display_name": "and_then(std::function<result_t (int)> &)",
+          "full_name": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>::and_then(std::function<result_t (int)> &)",
+          "id": "1228620055083656606",
           "name": "and_then",
           "namespace": "",
           "source_location": {
@@ -343,6 +359,7 @@ int tmain()
         },
         {
           "display_name": "value() const",
+          "full_name": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>::value() const",
           "id": "954804726969205606",
           "name": "value",
           "namespace": "",
@@ -355,7 +372,8 @@ int tmain()
           "type": "method"
         }
       ],
-      "display_name": "expected<int,error>",
+      "display_name": "result_t",
+      "full_name": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>",
       "id": "109801426773060225",
       "name": "expected",
       "namespace": "clanguml::t20044::detail",
@@ -371,6 +389,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:90:19)::operator()(auto &&) const",
           "id": "1768106129901104346",
           "name": "operator()",
           "namespace": "",
@@ -378,6 +397,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20044.cc:90:19)",
+      "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:90:19)",
       "id": "929315761786829928",
       "name": "tmain()::(lambda t20044.cc:90:19)",
       "namespace": "clanguml::t20044",
@@ -541,7 +561,7 @@ int tmain()
             "participant_id": "252888248193934644"
           },
           "name": "and_then((lambda at t20044.cc:90:19) &&)",
-          "return_type": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>",
+          "return_type": "result_t",
           "scope": "normal",
           "source_location": {
             "column": 12,
@@ -634,7 +654,7 @@ int tmain()
             "participant_id": "252888248193934644"
           },
           "name": "and_then(result_t (&)(int))",
-          "return_type": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>",
+          "return_type": "result_t",
           "scope": "normal",
           "source_location": {
             "column": 12,
@@ -643,7 +663,7 @@ int tmain()
             "translation_unit": "t20044.cc"
           },
           "to": {
-            "activity_id": "688251630893467966",
+            "activity_id": "1974891758151777473",
             "participant_id": "109801426773060225"
           },
           "type": "message"
@@ -654,7 +674,7 @@ int tmain()
             "participant_id": "252888248193934644"
           },
           "name": "and_then(std::function<result_t (int)> &)",
-          "return_type": "clanguml::t20044::detail::expected<int,clanguml::t20044::error>",
+          "return_type": "result_t",
           "scope": "normal",
           "source_location": {
             "column": 12,
@@ -663,7 +683,7 @@ int tmain()
             "translation_unit": "t20044.cc"
           },
           "to": {
-            "activity_id": "139031379616853201",
+            "activity_id": "1228620055083656606",
             "participant_id": "109801426773060225"
           },
           "type": "message"
diff --git a/docs/test_cases/t20044_sequence.svg b/docs/test_cases/t20044_sequence.svg
index ae19da59..4b3a8cf5 100644
--- a/docs/test_cases/t20044_sequence.svg
+++ b/docs/test_cases/t20044_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="1054px" preserveAspectRatio="none" style="width:1367px;height:1054px;" version="1.1" viewBox="0 0 1367 1054" width="1367px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1054px" preserveAspectRatio="none" style="width:1253px;height:1054px;" version="1.1" viewBox="0 0 1253 1054" width="1253px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgcl7eufw7ntl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ffzx75rntkikh" 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,112 +9,112 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="947.9844" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="157.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="128.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="197.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="415.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="474.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="758.75"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="189.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="729" y="256.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="503.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="290.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="576.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="976" y="787.8828"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="896.0156"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="939.1484"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="982.2813"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="215.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1213" y="629.9531"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="262.1953" style="stroke: #000000; stroke-width: 2.0;" width="797" x="559" y="591.6875"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="947.9844" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="157.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="128.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="197.0938"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="415.2891"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="474.4219"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="758.75"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="189.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="729" y="256.2266"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="503.5547"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="290.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="576.6875"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="906.5" y="787.8828"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="896.0156"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="939.1484"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="982.2813"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="215.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1099.5" y="629.9531"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="262.1953" style="stroke: #000000; stroke-width: 2.0;" width="683.5" x="559" y="591.6875"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1014.2813"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="288" x2="288" y1="38.2969" y2="1014.2813"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="435" x2="435" y1="38.2969" y2="1014.2813"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="582" x2="582" y1="38.2969" y2="1014.2813"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="734" x2="734" y1="38.2969" y2="1014.2813"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="976" x2="976" y1="38.2969" y2="1014.2813"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1218" x2="1218" y1="38.2969" y2="1014.2813"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L68" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L68" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="906" x2="906" y1="38.2969" y2="1014.2813"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1104.5" x2="1104.5" y1="38.2969" y2="1014.2813"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L68" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L68" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" 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(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1013.2813"/>
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1013.2813"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1033.2764">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L64" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L64" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="274" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L64" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L64" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="274" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="281" y="22.9951">R</text>
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="274" y="1013.2813"/>
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="274" y="1013.2813"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="281" y="1033.2764">R</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L74" target="_top" title="tmain()##(lambda t20044.cc:74:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L74" xlink:show="new" xlink:title="tmain()##(lambda t20044.cc:74:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="312" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L74" target="_top" title="tmain()##(lambda t20044.cc:74:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L74" xlink:show="new" xlink:title="tmain()##(lambda t20044.cc:74:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="312" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="319" y="22.9951">tmain()::(lambda t20044.cc:74:9)</text>
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="312" y="1013.2813"/>
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="312" y="1013.2813"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="319" y="1033.2764">tmain()::(lambda t20044.cc:74:9)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="569" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L50" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L50" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="569" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="576" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="569" y="1013.2813"/>
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="569" y="1013.2813"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="576" y="1033.2764">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L84" target="_top" title="tmain()##(lambda t20044.cc:84:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L84" xlink:show="new" xlink:title="tmain()##(lambda t20044.cc:84:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="606" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L84" target="_top" title="tmain()##(lambda t20044.cc:84:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L84" xlink:show="new" xlink:title="tmain()##(lambda t20044.cc:84:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="606" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="613" y="22.9951">tmain()::(lambda t20044.cc:84:18)</text>
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="606" y="1013.2813"/>
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="606" y="1013.2813"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="613" y="1033.2764">tmain()::(lambda t20044.cc:84:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L15" target="_top" title="expected" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L15" xlink:show="new" xlink:title="expected" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="872" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="190" x="879" y="22.9951">detail::expected&lt;int,error&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="872" y="1013.2813"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="190" x="879" y="1033.2764">detail::expected&lt;int,error&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L15" target="_top" title="expected" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L15" xlink:show="new" xlink:title="expected" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="872" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="879" y="22.9951">result_t</text>
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="872" y="1013.2813"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="879" y="1033.2764">result_t</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L90" target="_top" title="tmain()##(lambda t20044.cc:90:19)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L90" xlink:show="new" xlink:title="tmain()##(lambda t20044.cc:90:19)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="1090" y="3"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="1097" y="22.9951">tmain()::(lambda t20044.cc:90:19)</text>
-      <rect fill="#FEFECE" filter="url(#fgcl7eufw7ntl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="1090" y="1013.2813"/>
-      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="1097" y="1033.2764">tmain()::(lambda t20044.cc:90:19)</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L90" target="_top" title="tmain()##(lambda t20044.cc:90:19)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L90" xlink:show="new" xlink:title="tmain()##(lambda t20044.cc:90:19)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="976.5" y="3"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="983.5" y="22.9951">tmain()::(lambda t20044.cc:90:19)</text>
+      <rect fill="#FEFECE" filter="url(#ffzx75rntkikh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="976.5" y="1013.2813"/>
+      <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="983.5" y="1033.2764">tmain()::(lambda t20044.cc:90:19)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="947.9844" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="157.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="128.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="197.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="415.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="474.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="758.75"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="189.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="729" y="256.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="503.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="290.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="576.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="976" y="787.8828"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="896.0156"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="939.1484"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="971" y="982.2813"/>
-    <rect fill="#FFFFFF" filter="url(#fgcl7eufw7ntl)" height="215.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1213" y="629.9531"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="947.9844" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="157.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="128.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="197.0938"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="415.2891"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="474.4219"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="73.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="577.5" y="758.75"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="189.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="729" y="256.2266"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="503.5547"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="290.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="576.6875"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="906.5" y="787.8828"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="896.0156"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="939.1484"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="901.5" y="982.2813"/>
+    <rect fill="#FFFFFF" filter="url(#ffzx75rntkikh)" height="215.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1099.5" y="629.9531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="271,65.4297,281,69.4297,271,73.4297,275,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="218" x="53" y="64.3638">R((lambda at t20044.cc:74:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L65" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L65" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="418.5,94.5625,428.5,98.5625,418.5,102.5625,422.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="293" x2="424.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="300" y="93.4966">operator()() const</text>
     </a>
-    <path d="M319,111.5625 L319,166.5625 L547,166.5625 L547,121.5625 L537,111.5625 L319,111.5625 " fill="#FBFB77" filter="url(#fgcl7eufw7ntl)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M319,111.5625 L319,166.5625 L547,166.5625 L547,121.5625 L537,111.5625 L319,111.5625 " fill="#FBFB77" filter="url(#ffzx75rntkikh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M537,111.5625 L537,121.5625 L547,121.5625 L537,111.5625 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="179" x="325" y="128.6294">Call to template constructor</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="177" x="325" y="143.7622">with callable parameter and</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="325" y="158.895">lambda expression as argument</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="565.5,193.0938,575.5,197.0938,565.5,201.0938,569.5,197.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="440.5" x2="571.5" y1="197.0938" y2="197.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="57" x="447.5" y="192.0278">a() const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="717,252.2266,727,256.2266,717,260.2266,721,256.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="723" y1="256.2266" y2="256.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="53" y="251.1606">operator()() const</text>
     </a>
-    <path d="M610,269.2266 L610,384.2266 L853,384.2266 L853,279.2266 L843,269.2266 L610,269.2266 " fill="#FBFB77" filter="url(#fgcl7eufw7ntl)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M610,269.2266 L610,384.2266 L853,384.2266 L853,279.2266 L843,269.2266 L610,269.2266 " fill="#FBFB77" filter="url(#ffzx75rntkikh)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M843,269.2266 L843,279.2266 L853,279.2266 L843,269.2266 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="616" y="286.2935">The message to detail2::run()</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="161" x="616" y="301.4263">is skipped due to exclude</text>
@@ -123,79 +123,79 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="222" x="616" y="346.8247">rendered TODO: Add some marker</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="142" x="616" y="361.9575">to highlight that this is</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="616" y="377.0903">not a direct call</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L84" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L84" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="598.5,411.2891,588.5,415.2891,598.5,419.2891,594.5,415.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="592.5" x2="728" y1="415.2891" y2="415.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="604.5" y="410.2231">a5()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="565.5,470.4219,575.5,474.4219,565.5,478.4219,569.5,474.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="571.5" y1="474.4219" y2="474.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="65" x="53" y="469.356">a1() const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="959,499.5547,969,503.5547,959,507.5547,963,503.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="587.5" x2="965" y1="503.5547" y2="503.5547"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="889.5,499.5547,899.5,503.5547,889.5,507.5547,893.5,503.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="587.5" x2="895.5" y1="503.5547" y2="503.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="594.5" y="498.4888">expected(int)</text>
     </a>
     <polygon fill="#A80036" points="57,543.5547,47,547.5547,57,551.5547,53,547.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="581.5" y1="547.5547" y2="547.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="959,572.6875,969,576.6875,959,580.6875,963,576.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="965" y1="576.6875" y2="576.6875"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="889.5,572.6875,899.5,576.6875,889.5,580.6875,893.5,576.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="895.5" y1="576.6875" y2="576.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="278" x="53" y="571.6216">and_then((lambda at t20044.cc:90:19) &amp;&amp;)</text>
     </a>
     <path d="M559,591.6875 L623,591.6875 L623,598.6875 L613,608.6875 L559,608.6875 L559,591.6875 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
-    <rect fill="none" height="262.1953" style="stroke: #000000; stroke-width: 2.0;" width="797" x="559" y="591.6875"/>
+    <rect fill="none" height="262.1953" style="stroke: #000000; stroke-width: 2.0;" width="683.5" x="559" y="591.6875"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="574" y="604.7544">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="1201,625.9531,1211,629.9531,1201,633.9531,1205,629.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="981" x2="1207" y1="629.9531" y2="629.9531"/>
-      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="988" y="624.8872">operator()(auto &amp;&amp;) const</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="1087.5,625.9531,1097.5,629.9531,1087.5,633.9531,1091.5,629.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="911.5" x2="1093.5" y1="629.9531" y2="629.9531"/>
+      <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="918.5" y="624.8872">operator()(auto &amp;&amp;) const</text>
     </a>
-    <path d="M1100,642.9531 L1100,727.9531 L1332,727.9531 L1332,652.9531 L1322,642.9531 L1100,642.9531 " fill="#FBFB77" filter="url(#fgcl7eufw7ntl)" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1322,642.9531 L1322,652.9531 L1332,652.9531 L1322,642.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="168" x="1106" y="660.02">Call to a template method</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="155" x="1106" y="675.1528">accepting a callable with</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="211" x="1106" y="690.2856">lambda expression as argument,</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="196" x="1106" y="705.4185">fully tracked showing method's</text>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="1106" y="720.5513">activity and</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L90" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L90" xlink:show="new" xlink:title="" xlink:type="simple">
+    <path d="M986,642.9531 L986,727.9531 L1218,727.9531 L1218,652.9531 L1208,642.9531 L986,642.9531 " fill="#FBFB77" filter="url(#ffzx75rntkikh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1208,642.9531 L1208,652.9531 L1218,652.9531 L1208,642.9531 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="168" x="992" y="660.02">Call to a template method</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="155" x="992" y="675.1528">accepting a callable with</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="211" x="992" y="690.2856">lambda expression as argument,</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="196" x="992" y="705.4185">fully tracked showing method's</text>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="992" y="720.5513">activity and</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L90" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L90" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="598.5,754.75,588.5,758.75,598.5,762.75,594.5,758.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="592.5" x2="1212" y1="758.75" y2="758.75"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="592.5" x2="1098.5" y1="758.75" y2="758.75"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="604.5" y="753.6841">a2(int) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="964,783.8828,974,787.8828,964,791.8828,968,787.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="587.5" x2="970" y1="787.8828" y2="787.8828"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="894.5,783.8828,904.5,787.8828,894.5,791.8828,898.5,787.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="587.5" x2="900.5" y1="787.8828" y2="787.8828"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="594.5" y="782.8169">expected(int)</text>
     </a>
-    <polygon fill="#A80036" points="1201,827.8828,1211,831.8828,1201,835.8828,1205,831.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="582.5" x2="1207" y1="831.8828" y2="831.8828"/>
-    <polygon fill="#A80036" points="992,841.8828,982,845.8828,992,849.8828,988,845.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="986" x2="1217" y1="845.8828" y2="845.8828"/>
+    <polygon fill="#A80036" points="1087.5,827.8828,1097.5,831.8828,1087.5,835.8828,1091.5,831.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="582.5" x2="1093.5" y1="831.8828" y2="831.8828"/>
+    <polygon fill="#A80036" points="922.5,841.8828,912.5,845.8828,922.5,849.8828,918.5,845.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="916.5" x2="1103.5" y1="845.8828" y2="845.8828"/>
     <polygon fill="#A80036" points="57,862.8828,47,866.8828,57,870.8828,53,866.8828" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="975" y1="866.8828" y2="866.8828"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="959,892.0156,969,896.0156,959,900.0156,963,896.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="965" y1="896.0156" y2="896.0156"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="905.5" y1="866.8828" y2="866.8828"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="889.5,892.0156,899.5,896.0156,889.5,900.0156,893.5,896.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="895.5" y1="896.0156" y2="896.0156"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="53" y="890.9497">and_then(result_t (&amp;)(int))</text>
     </a>
     <polygon fill="#A80036" points="57,906.0156,47,910.0156,57,914.0156,53,910.0156" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="975" y1="910.0156" y2="910.0156"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="959,935.1484,969,939.1484,959,943.1484,963,939.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="965" y1="939.1484" y2="939.1484"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="905.5" y1="910.0156" y2="910.0156"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="889.5,935.1484,899.5,939.1484,889.5,943.1484,893.5,939.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="895.5" y1="939.1484" y2="939.1484"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="264" x="53" y="934.0825">and_then(std::function&lt;result_t (int)&gt; &amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,949.1484,47,953.1484,57,957.1484,53,953.1484" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="975" y1="953.1484" y2="953.1484"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
-      <polygon fill="#A80036" points="959,978.2813,969,982.2813,959,986.2813,963,982.2813" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="965" y1="982.2813" y2="982.2813"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="905.5" y1="953.1484" y2="953.1484"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20044/t20044.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+      <polygon fill="#A80036" points="889.5,978.2813,899.5,982.2813,889.5,986.2813,893.5,982.2813" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="895.5" y1="982.2813" y2="982.2813"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="83" x="53" y="977.2153">value() const</text>
     </a>
     <polygon fill="#A80036" points="52,992.2813,42,996.2813,52,1000.2813,48,996.2813" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="975" y1="996.2813" y2="996.2813"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="46" x2="905.5" y1="996.2813" y2="996.2813"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t20044_sequence_mermaid.svg b/docs/test_cases/t20044_sequence_mermaid.svg
index 03e4df3e..8b2860fa 100644
--- a/docs/test_cases/t20044_sequence_mermaid.svg
+++ b/docs/test_cases/t20044_sequence_mermaid.svg
@@ -1,14 +1,14 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1859 1265" style="max-width: 1859px; background-color: white;" width="1859" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1818 1265" style="max-width: 1818px; background-color: white;" width="1818" id="my-svg">
   <g>
-    <rect class="actor" ry="3" rx="3" height="65" width="241" stroke="#666" fill="#eaeaea" y="1179" x="1508"/>
-    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1211.5" x="1628.5">
-      <tspan dy="0" x="1628.5">tmain()::(lambda t20044.cc:90:19)</tspan>
+    <rect class="actor" ry="3" rx="3" height="65" width="241" stroke="#666" fill="#eaeaea" y="1179" x="1467"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1211.5" x="1587.5">
+      <tspan dy="0" x="1587.5">tmain()::(lambda t20044.cc:90:19)</tspan>
     </text>
   </g>
   <g>
-    <rect class="actor" ry="3" rx="3" height="65" width="191" stroke="#666" fill="#eaeaea" y="1179" x="1267"/>
-    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1211.5" x="1362.5">
-      <tspan dy="0" x="1362.5">detail::expected&lt;int,error&gt;</tspan>
+    <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="1179" x="1267"/>
+    <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="1211.5" x="1342">
+      <tspan dy="0" x="1342">result_t</tspan>
     </text>
   </g>
   <g>
@@ -42,20 +42,20 @@
     </text>
   </g>
   <g>
-    <line stroke="#999" stroke-width="0.5px" class="200" y2="1179" x2="1628.5" y1="5" x1="1628.5" id="actor6"/>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="1179" x2="1587.5" y1="5" x1="1587.5" id="actor6"/>
     <g id="root-6">
-      <rect class="actor" ry="3" rx="3" height="65" width="241" stroke="#666" fill="#eaeaea" y="0" x="1508"/>
-      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="1628.5">
-        <tspan dy="0" x="1628.5">tmain()::(lambda t20044.cc:90:19)</tspan>
+      <rect class="actor" ry="3" rx="3" height="65" width="241" stroke="#666" fill="#eaeaea" y="0" x="1467"/>
+      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="1587.5">
+        <tspan dy="0" x="1587.5">tmain()::(lambda t20044.cc:90:19)</tspan>
       </text>
     </g>
   </g>
   <g>
-    <line stroke="#999" stroke-width="0.5px" class="200" y2="1179" x2="1362.5" y1="5" x1="1362.5" id="actor5"/>
+    <line stroke="#999" stroke-width="0.5px" class="200" y2="1179" x2="1342" y1="5" x1="1342" id="actor5"/>
     <g id="root-5">
-      <rect class="actor" ry="3" rx="3" height="65" width="191" stroke="#666" fill="#eaeaea" y="0" x="1267"/>
-      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="1362.5">
-        <tspan dy="0" x="1362.5">detail::expected&lt;int,error&gt;</tspan>
+      <rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="1267"/>
+      <text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="1342">
+        <tspan dy="0" x="1342">result_t</tspan>
       </text>
     </g>
   </g>
@@ -200,57 +200,57 @@
     <rect class="activation0" ry="0" rx="0" height="54" width="10" stroke="#666" fill="#EDF2AE" y="573" x="846"/>
   </g>
   <g>
-    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="611" x="1357.5"/>
+    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="611" x="1337"/>
   </g>
   <g>
-    <rect class="activation0" ry="0" rx="0" height="316" width="10" stroke="#666" fill="#EDF2AE" y="675" x="1357.5"/>
+    <rect class="activation0" ry="0" rx="0" height="316" width="10" stroke="#666" fill="#EDF2AE" y="675" x="1337"/>
   </g>
   <g>
-    <rect class="activation0" ry="0" rx="0" height="225" width="10" stroke="#666" fill="#EDF2AE" y="746" x="1623.5"/>
+    <rect class="activation0" ry="0" rx="0" height="225" width="10" stroke="#666" fill="#EDF2AE" y="746" x="1582.5"/>
   </g>
   <g>
-    <rect class="note" ry="0" rx="0" height="105" width="241" stroke="#666" fill="#EDF2AE" y="754" x="1508"/>
-    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="759" x="1629">
-      <tspan x="1629">Call to a template method</tspan>
+    <rect class="note" ry="0" rx="0" height="105" width="241" stroke="#666" fill="#EDF2AE" y="754" x="1467"/>
+    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="759" x="1588">
+      <tspan x="1588">Call to a template method</tspan>
     </text>
-    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="1629">
-      <tspan x="1629">accepting a callable with</tspan>
+    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="776" x="1588">
+      <tspan x="1588">accepting a callable with</tspan>
     </text>
-    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="793" x="1629">
-      <tspan x="1629">lambda expression as argument,</tspan>
+    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="793" x="1588">
+      <tspan x="1588">lambda expression as argument,</tspan>
     </text>
-    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="810" x="1629">
-      <tspan x="1629">fully tracked showing method's</tspan>
+    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="810" x="1588">
+      <tspan x="1588">fully tracked showing method's</tspan>
     </text>
-    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="827" x="1629">
-      <tspan x="1629">activity and</tspan>
+    <text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="827" x="1588">
+      <tspan x="1588">activity and</tspan>
     </text>
   </g>
   <g>
     <rect class="activation0" ry="0" rx="0" height="54" width="10" stroke="#666" fill="#EDF2AE" y="907" x="846"/>
   </g>
   <g>
-    <rect class="activation1" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="945" x="1362.5"/>
+    <rect class="activation1" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="945" x="1342"/>
   </g>
   <g>
-    <line class="loopLine" y2="683" x2="1759" y1="683" x1="836"/>
-    <line class="loopLine" y2="981" x2="1759" y1="683" x1="1759"/>
-    <line class="loopLine" y2="981" x2="1759" y1="981" x1="836"/>
+    <line class="loopLine" y2="683" x2="1718" y1="683" x1="836"/>
+    <line class="loopLine" y2="981" x2="1718" y1="683" x1="1718"/>
+    <line class="loopLine" y2="981" x2="1718" y1="981" x1="836"/>
     <line class="loopLine" y2="981" x2="836" y1="683" x1="836"/>
     <polygon class="labelBox" points="836,683 886,683 886,696 877.6,703 836,703"/>
     <text style="font-size: 16px; font-weight: 400;" class="labelText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="696" x="861">alt</text>
-    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="701" x="1322.5">
-      <tspan x="1322.5">​</tspan>
+    <text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="701" x="1302">
+      <tspan x="1302">​</tspan>
     </text>
   </g>
   <g>
-    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1041" x="1357.5"/>
+    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1041" x="1337"/>
   </g>
   <g>
-    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1097" x="1357.5"/>
+    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1097" x="1337"/>
   </g>
   <g>
-    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1153" x="1357.5"/>
+    <rect class="activation0" ry="0" rx="0" height="18" width="10" stroke="#666" fill="#EDF2AE" y="1153" x="1337"/>
   </g>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="224">R((lambda at t20044.cc:74:9) &amp;&amp;)</text>
   <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="368" y1="111" x1="80"/>
@@ -264,34 +264,34 @@
   <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="525" x2="851" y1="525" x1="1091.5"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="540" x="466">a1() const</text>
   <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="571" x2="851" y1="571" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="1109">expected(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="1362.5" y1="617" x1="856"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="586" x="1099">expected(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="617" x2="1342" y1="617" x1="856"/>
   <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="632" x="463">​</text>
   <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="627" x2="80" y1="627" x1="846"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="642" x="721">and_then((lambda at t20044.cc:90:19) &amp;&amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="673" x2="1362.5" y1="673" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="713" x="1498">operator()(auto &amp;&amp;) const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="744" x2="1628.5" y1="744" x1="1367.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="874" x="1237">a2(int) const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="905" x2="851" y1="905" x1="1623.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="920" x="1107">expected(int)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="951" x2="1357.5" y1="951" x1="856"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="966" x="1240">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="961" x2="1623.5" y1="961" x1="856"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="976" x="1496">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="971" x2="1367.5" y1="971" x1="1623.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="996" x="719">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="991" x2="80" y1="991" x1="1357.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1006" x="721">and_then(result_t (&amp;)(int))</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1037" x2="1362.5" y1="1037" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1052" x="719">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1047" x2="80" y1="1047" x1="1357.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1062" x="721">and_then(std::function&lt;result_t (int)&gt; &amp;)</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1093" x2="1362.5" y1="1093" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1108" x="719">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1103" x2="80" y1="1103" x1="1357.5"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1118" x="721">value() const</text>
-  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1149" x2="1362.5" y1="1149" x1="80"/>
-  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1164" x="719">​</text>
-  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1159" x2="80" y1="1159" x1="1357.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="642" x="711">and_then((lambda at t20044.cc:90:19) &amp;&amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="673" x2="1342" y1="673" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="713" x="1467">operator()(auto &amp;&amp;) const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="744" x2="1587.5" y1="744" x1="1347"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="874" x="1217">a2(int) const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="905" x2="851" y1="905" x1="1582.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="920" x="1097">expected(int)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="951" x2="1337" y1="951" x1="856"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="966" x="1219">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="961" x2="1582.5" y1="961" x1="856"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="976" x="1465">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="971" x2="1347" y1="971" x1="1582.5"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="996" x="709">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="991" x2="80" y1="991" x1="1337"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1006" x="711">and_then(result_t (&amp;)(int))</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1037" x2="1342" y1="1037" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1052" x="709">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1047" x2="80" y1="1047" x1="1337"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1062" x="711">and_then(std::function&lt;result_t (int)&gt; &amp;)</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1093" x2="1342" y1="1093" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1108" x="709">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1103" x2="80" y1="1103" x1="1337"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1118" x="711">value() const</text>
+  <line style="fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="1149" x2="1342" y1="1149" x1="80"/>
+  <text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="1164" x="709">​</text>
+  <line style="stroke-dasharray: 3, 3; fill: none;" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="1159" x2="80" y1="1159" x1="1337"/>
 </svg>
diff --git a/docs/test_cases/t20045.md b/docs/test_cases/t20045.md
index 2b17fa49..9941a857 100644
--- a/docs/test_cases/t20045.md
+++ b/docs/test_cases/t20045.md
@@ -78,6 +78,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20045::tmain()",
       "id": "2117440102058621189",
       "name": "tmain",
       "namespace": "clanguml::t20045",
@@ -91,6 +92,7 @@ int tmain()
     },
     {
       "display_name": "a2(int)",
+      "full_name": "clanguml::t20045::a2(int)",
       "id": "422137031007650421",
       "name": "a2",
       "namespace": "clanguml::t20045",
@@ -103,7 +105,8 @@ int tmain()
       "type": "function"
     },
     {
-      "display_name": "a1<(lambda at t20045.cc:35:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:35:18) &&)",
+      "display_name": "a1<(lambda at t20045.cc:35:18)>((lambda at t20045.cc:35:18) &&)",
+      "full_name": "clanguml::t20045::a1<(lambda at t20045.cc:35:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:35:18) &&)",
       "id": "771242326042389239",
       "name": "a1",
       "namespace": "clanguml::t20045",
@@ -119,6 +122,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:35:18)::operator()(auto &&) const",
           "id": "1420491111902448188",
           "name": "operator()",
           "namespace": "",
@@ -126,6 +130,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20045.cc:35:18)",
+      "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:35:18)",
       "id": "36644484176793235",
       "name": "tmain()::(lambda t20045.cc:35:18)",
       "namespace": "clanguml::t20045",
@@ -139,6 +144,7 @@ int tmain()
     },
     {
       "display_name": "a3(int)",
+      "full_name": "clanguml::t20045::a3(int)",
       "id": "399307921304660486",
       "name": "a3",
       "namespace": "clanguml::t20045",
@@ -151,7 +157,8 @@ int tmain()
       "type": "function"
     },
     {
-      "display_name": "a1<(lambda at t20045.cc:37:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:37:18) &&)",
+      "display_name": "a1<(lambda at t20045.cc:37:18)>((lambda at t20045.cc:37:18) &&)",
+      "full_name": "clanguml::t20045::a1<(lambda at t20045.cc:37:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:37:18) &&)",
       "id": "708264873048728082",
       "name": "a1",
       "namespace": "clanguml::t20045",
@@ -167,6 +174,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:37:18)::operator()(auto &&) const",
           "id": "1995217387134011144",
           "name": "operator()",
           "namespace": "",
@@ -174,6 +182,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20045.cc:37:18)",
+      "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:37:18)",
       "id": "1556269922572504148",
       "name": "tmain()::(lambda t20045.cc:37:18)",
       "namespace": "clanguml::t20045",
@@ -189,6 +198,7 @@ int tmain()
       "activities": [
         {
           "display_name": "b1(int)",
+          "full_name": "clanguml::t20045::B::b1(int)",
           "id": "820437645998690739",
           "name": "b1",
           "namespace": "",
@@ -202,6 +212,7 @@ int tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20045::B",
       "id": "1737887355752592935",
       "name": "B",
       "namespace": "clanguml::t20045",
@@ -214,7 +225,8 @@ int tmain()
       "type": "class"
     },
     {
-      "display_name": "a1<(lambda at t20045.cc:39:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:39:18) &&)",
+      "display_name": "a1<(lambda at t20045.cc:39:18)>((lambda at t20045.cc:39:18) &&)",
+      "full_name": "clanguml::t20045::a1<(lambda at t20045.cc:39:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:39:18) &&)",
       "id": "1935046237572139126",
       "name": "a1",
       "namespace": "clanguml::t20045",
@@ -230,6 +242,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:39:18)::operator()(auto &&) const",
           "id": "786866346046560964",
           "name": "operator()",
           "namespace": "",
@@ -237,6 +250,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20045.cc:39:18)",
+      "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:39:18)",
       "id": "132403781431240789",
       "name": "tmain()::(lambda t20045.cc:39:18)",
       "namespace": "clanguml::t20045",
@@ -252,6 +266,7 @@ int tmain()
       "activities": [
         {
           "display_name": "get_x() const",
+          "full_name": "clanguml::t20045::C::get_x() const",
           "id": "570815384165305751",
           "name": "get_x",
           "namespace": "",
@@ -265,6 +280,7 @@ int tmain()
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20045::C",
       "id": "1812199014066862625",
       "name": "C",
       "namespace": "clanguml::t20045",
diff --git a/docs/test_cases/t20045_sequence.svg b/docs/test_cases/t20045_sequence.svg
index 4031c6ff..da0266ed 100644
--- a/docs/test_cases/t20045_sequence.svg
+++ b/docs/test_cases/t20045_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="454px" preserveAspectRatio="none" style="width:2602px;height:454px;" version="1.1" viewBox="0 0 2602 454" width="2602px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f18u3iwbeww4jc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1k5oopzqym1p6" 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,17 +9,17 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="347.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="396.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="780" y="111.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="949" y="125.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1235.5" y="181.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1619" y="210.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1771" y="239.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2040.5" y="295.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2424" y="324.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2576" y="353.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="347.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="396.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="780" y="111.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="949" y="125.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1235.5" y="181.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1619" y="210.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1771" y="239.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2040.5" y="295.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2424" y="324.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2576" y="353.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="413.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="115" x2="115" y1="38.2969" y2="413.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="401" x2="401" y1="38.2969" y2="413.9609"/>
@@ -31,99 +31,99 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="2045" x2="2045" y1="38.2969" y2="413.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="2429" x2="2429" y1="38.2969" y2="413.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="2581" x2="2581" y1="38.2969" y2="413.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" 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(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="432.9561">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L6" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L6" xlink:show="new" xlink:title="a2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L6" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L6" xlink:show="new" xlink:title="a2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="91" y="22.9951">a2(int)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="91" y="432.9561">a2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="156" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="156" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="473" x="163" y="22.9951">a1&lt;(lambda at t20045.cc:35:18)&gt;((lambda at t20045.cc:35:18) &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="156" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="156" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="473" x="163" y="432.9561">a1&lt;(lambda at t20045.cc:35:18)&gt;((lambda at t20045.cc:35:18) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L35" target="_top" title="tmain()##(lambda t20045.cc:35:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L35" xlink:show="new" xlink:title="tmain()##(lambda t20045.cc:35:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="657" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L35" target="_top" title="tmain()##(lambda t20045.cc:35:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L35" xlink:show="new" xlink:title="tmain()##(lambda t20045.cc:35:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="657" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="664" y="22.9951">tmain()::(lambda t20045.cc:35:18)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="657" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="657" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="664" y="432.9561">tmain()::(lambda t20045.cc:35:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L8" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L8" xlink:show="new" xlink:title="a3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="923" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L8" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L8" xlink:show="new" xlink:title="a3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="923" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="930" y="22.9951">a3(int)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="923" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="923" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="930" y="432.9561">a3(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="995" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="995" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="473" x="1002" y="22.9951">a1&lt;(lambda at t20045.cc:37:18)&gt;((lambda at t20045.cc:37:18) &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="995" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="995" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="473" x="1002" y="432.9561">a1&lt;(lambda at t20045.cc:37:18)&gt;((lambda at t20045.cc:37:18) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L37" target="_top" title="tmain()##(lambda t20045.cc:37:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L37" xlink:show="new" xlink:title="tmain()##(lambda t20045.cc:37:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="1496" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L37" target="_top" title="tmain()##(lambda t20045.cc:37:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L37" xlink:show="new" xlink:title="tmain()##(lambda t20045.cc:37:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="1496" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="1503" y="22.9951">tmain()::(lambda t20045.cc:37:18)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="1496" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="1496" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="1503" y="432.9561">tmain()::(lambda t20045.cc:37:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="1762" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="1762" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="1769" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="1762" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="1762" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="1769" y="432.9561">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="1800" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="1800" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="473" x="1807" y="22.9951">a1&lt;(lambda at t20045.cc:39:18)&gt;((lambda at t20045.cc:39:18) &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="1800" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="487" x="1800" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="473" x="1807" y="432.9561">a1&lt;(lambda at t20045.cc:39:18)&gt;((lambda at t20045.cc:39:18) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L39" target="_top" title="tmain()##(lambda t20045.cc:39:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L39" xlink:show="new" xlink:title="tmain()##(lambda t20045.cc:39:18)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="2301" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L39" target="_top" title="tmain()##(lambda t20045.cc:39:18)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L39" xlink:show="new" xlink:title="tmain()##(lambda t20045.cc:39:18)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="2301" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="2308" y="22.9951">tmain()::(lambda t20045.cc:39:18)</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="2301" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="2301" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="2308" y="432.9561">tmain()::(lambda t20045.cc:39:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="2567" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="2567" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="2574" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f18u3iwbeww4jc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="2567" y="412.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1k5oopzqym1p6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="2567" y="412.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="2574" y="432.9561">C</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="347.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="396.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="780" y="111.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="949" y="125.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1235.5" y="181.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1619" y="210.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1771" y="239.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2040.5" y="295.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2424" y="324.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f18u3iwbeww4jc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2576" y="353.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="347.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="396.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="780" y="111.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="949" y="125.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1235.5" y="181.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1619" y="210.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1771" y="239.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2040.5" y="295.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2424" y="324.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1k5oopzqym1p6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2576" y="353.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,50.2969,108,54.2969,98,58.2969,102,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="104" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="57,64.2969,47,68.2969,57,72.2969,53,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="114" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="384.5,78.2969,394.5,82.2969,384.5,86.2969,388.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="390.5" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="768,107.4297,778,111.4297,768,115.4297,772,111.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="406.5" x2="774" y1="111.4297" y2="111.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="413.5" y="106.3638">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="937,121.4297,947,125.4297,937,129.4297,941,125.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="790" x2="943" y1="125.4297" y2="125.4297"/>
     </a>
@@ -133,16 +133,16 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="411.5" x2="784" y1="153.4297" y2="153.4297"/>
     <polygon fill="#A80036" points="57,163.4297,47,167.4297,57,171.4297,53,167.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="400.5" y1="167.4297" y2="167.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1223.5,177.4297,1233.5,181.4297,1223.5,185.4297,1227.5,181.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1229.5" y1="181.4297" y2="181.4297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1607,206.5625,1617,210.5625,1607,214.5625,1611,210.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1245.5" x2="1613" y1="210.5625" y2="210.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="1252.5" y="205.4966">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1759,235.6953,1769,239.6953,1759,243.6953,1763,239.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1629" x2="1765" y1="239.6953" y2="239.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="1636" y="234.6294">b1(int)</text>
@@ -153,16 +153,16 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1250.5" x2="1623" y1="267.6953" y2="267.6953"/>
     <polygon fill="#A80036" points="57,277.6953,47,281.6953,57,285.6953,53,281.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="1239.5" y1="281.6953" y2="281.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="2028.5,291.6953,2038.5,295.6953,2028.5,299.6953,2032.5,295.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="2034.5" y1="295.6953" y2="295.6953"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="2412,320.8281,2422,324.8281,2412,328.8281,2416,324.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="2050.5" x2="2418" y1="324.8281" y2="324.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="2057.5" y="319.7622">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20045/t20045.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20045/t20045.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="2564,349.9609,2574,353.9609,2564,357.9609,2568,353.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="2434" x2="2570" y1="353.9609" y2="353.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="2441" y="348.895">get_x() const</text>
diff --git a/docs/test_cases/t20046.md b/docs/test_cases/t20046.md
index a0e40e1f..1ca17487 100644
--- a/docs/test_cases/t20046.md
+++ b/docs/test_cases/t20046.md
@@ -55,6 +55,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20046::tmain()",
       "id": "1092597347191364515",
       "name": "tmain",
       "namespace": "clanguml::t20046",
@@ -70,6 +71,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::operator()(auto &&) const",
           "id": "174997669781821772",
           "name": "operator()",
           "namespace": "",
@@ -77,6 +79,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20046.cc:13:15)",
+      "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:13:15)",
       "id": "1868201491114557068",
       "name": "tmain()::(lambda t20046.cc:13:15)",
       "namespace": "clanguml::t20046",
@@ -92,6 +95,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)::operator()(auto &&) const",
           "id": "771372907204554082",
           "name": "operator()",
           "namespace": "",
@@ -99,6 +103,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)",
+      "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)",
       "id": "163480314503646451",
       "name": "clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)",
       "namespace": "clanguml::t20046",
@@ -112,6 +117,7 @@ int tmain()
     },
     {
       "display_name": "a2(int)",
+      "full_name": "clanguml::t20046::a2(int)",
       "id": "267222823829967475",
       "name": "a2",
       "namespace": "clanguml::t20046",
@@ -124,7 +130,8 @@ int tmain()
       "type": "function"
     },
     {
-      "display_name": "a1<(lambda at t20046.cc:19:9)>((lambda at /home/bartek/devel/clang-uml/tests/t20046/t20046.cc:19:9) &&)",
+      "display_name": "a1<(lambda at t20046.cc:19:9)>((lambda at t20046.cc:19:9) &&)",
+      "full_name": "clanguml::t20046::a1<(lambda at t20046.cc:19:9)>((lambda at /home/bartek/devel/clang-uml/tests/t20046/t20046.cc:19:9) &&)",
       "id": "404852580994337987",
       "name": "a1",
       "namespace": "clanguml::t20046",
@@ -140,6 +147,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::operator()(auto &&) const",
           "id": "326496579896748789",
           "name": "operator()",
           "namespace": "",
@@ -147,6 +155,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20046.cc:19:9)",
+      "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:19:9)",
       "id": "1833526997995356163",
       "name": "tmain()::(lambda t20046.cc:19:9)",
       "namespace": "clanguml::t20046",
@@ -162,6 +171,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)::operator()(auto &&) const",
           "id": "1093593470536515636",
           "name": "operator()",
           "namespace": "",
@@ -169,6 +179,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)",
+      "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)",
       "id": "2177951153338850159",
       "name": "clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)",
       "namespace": "clanguml::t20046",
@@ -182,6 +193,7 @@ int tmain()
     },
     {
       "display_name": "a3(int)",
+      "full_name": "clanguml::t20046::a3(int)",
       "id": "1043774975066033521",
       "name": "a3",
       "namespace": "clanguml::t20046",
diff --git a/docs/test_cases/t20046_sequence.svg b/docs/test_cases/t20046_sequence.svg
index 1ac1a799..a78b8b44 100644
--- a/docs/test_cases/t20046_sequence.svg
+++ b/docs/test_cases/t20046_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="355px" preserveAspectRatio="none" style="width:2161px;height:355px;" version="1.1" viewBox="0 0 2161 355" width="2161px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f157zkgz76rohm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1g1myqr7ces8w" 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(#f157zkgz76rohm)" height="248.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="234" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="595" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="859" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="128.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1136.5" y="168.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1506.5" y="197.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1858.5" y="226.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2118" y="240.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="248.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="234" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="595" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="859" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="128.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1136.5" y="168.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1506.5" y="197.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1858.5" y="226.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2118" y="240.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="314.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="239" x2="239" y1="38.2969" y2="314.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="600" x2="600" y1="38.2969" y2="314.8281"/>
@@ -25,73 +25,73 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1511" x2="1511" y1="38.2969" y2="314.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1863" x2="1863" y1="38.2969" y2="314.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="2123" x2="2123" y1="38.2969" y2="314.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" 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(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="333.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L13" target="_top" title="tmain()##(lambda t20046.cc:13:15)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L13" xlink:show="new" xlink:title="tmain()##(lambda t20046.cc:13:15)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="111" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L13" target="_top" title="tmain()##(lambda t20046.cc:13:15)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L13" xlink:show="new" xlink:title="tmain()##(lambda t20046.cc:13:15)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="111" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="118" y="22.9951">tmain()::(lambda t20046.cc:13:15)</text>
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="111" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="111" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="118" y="333.8232">tmain()::(lambda t20046.cc:13:15)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L14" target="_top" title="clanguml::t20046::tmain()##(lambda t20046.cc:13:15)##(lambda t20046.cc:14:16)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L14" xlink:show="new" xlink:title="clanguml::t20046::tmain()##(lambda t20046.cc:13:15)##(lambda t20046.cc:14:16)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="442" x="377" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L14" target="_top" title="clanguml::t20046::tmain()##(lambda t20046.cc:13:15)##(lambda t20046.cc:14:16)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L14" xlink:show="new" xlink:title="clanguml::t20046::tmain()##(lambda t20046.cc:13:15)##(lambda t20046.cc:14:16)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="442" x="377" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="428" x="384" y="22.9951">tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)</text>
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="442" x="377" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="442" x="377" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="428" x="384" y="333.8232">tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L6" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L6" xlink:show="new" xlink:title="a2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="833" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L6" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L6" xlink:show="new" xlink:title="a2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="833" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="840" y="22.9951">a2(int)</text>
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="833" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="833" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="840" y="333.8232">a2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="905" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="905" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="455" x="912" y="22.9951">a1&lt;(lambda at t20046.cc:19:9)&gt;((lambda at t20046.cc:19:9) &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="905" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="905" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="455" x="912" y="333.8232">a1&lt;(lambda at t20046.cc:19:9)&gt;((lambda at t20046.cc:19:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" target="_top" title="tmain()##(lambda t20046.cc:19:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="tmain()##(lambda t20046.cc:19:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1388" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" target="_top" title="tmain()##(lambda t20046.cc:19:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="tmain()##(lambda t20046.cc:19:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1388" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1395" y="22.9951">tmain()::(lambda t20046.cc:19:9)</text>
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1388" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="243" x="1388" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="229" x="1395" y="333.8232">tmain()::(lambda t20046.cc:19:9)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" target="_top" title="clanguml::t20046::tmain()##(lambda t20046.cc:19:9)##(lambda t20046.cc:19:34)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="clanguml::t20046::tmain()##(lambda t20046.cc:19:9)##(lambda t20046.cc:19:34)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="433" x="1645" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" target="_top" title="clanguml::t20046::tmain()##(lambda t20046.cc:19:9)##(lambda t20046.cc:19:34)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="clanguml::t20046::tmain()##(lambda t20046.cc:19:9)##(lambda t20046.cc:19:34)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="433" x="1645" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="419" x="1652" y="22.9951">tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)</text>
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="433" x="1645" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="433" x="1645" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="419" x="1652" y="333.8232">tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L8" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L8" xlink:show="new" xlink:title="a3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="2092" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L8" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L8" xlink:show="new" xlink:title="a3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="2092" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="2099" y="22.9951">a3(int)</text>
-      <rect fill="#FEFECE" filter="url(#f157zkgz76rohm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="2092" y="313.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1g1myqr7ces8w)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="2092" y="313.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="2099" y="333.8232">a3(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="248.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="234" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="595" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="859" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="128.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1136.5" y="168.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1506.5" y="197.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1858.5" y="226.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f157zkgz76rohm)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2118" y="240.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="248.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="234" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="595" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="859" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="128.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1136.5" y="168.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="85.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1506.5" y="197.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1858.5" y="226.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1g1myqr7ces8w)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="2118" y="240.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="222,65.4297,232,69.4297,222,73.4297,226,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="228" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="53" y="64.3638">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="583,94.5625,593,98.5625,583,102.5625,587,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="244" x2="589" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="251" y="93.4966">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="847,108.5625,857,112.5625,847,116.5625,851,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="605" x2="853" y1="112.5625" y2="112.5625"/>
     </a>
@@ -101,21 +101,21 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="249" x2="599" y1="140.5625" y2="140.5625"/>
     <polygon fill="#A80036" points="57,150.5625,47,154.5625,57,158.5625,53,154.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="238" y1="154.5625" y2="154.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1124.5,164.5625,1134.5,168.5625,1124.5,172.5625,1128.5,168.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1130.5" y1="168.5625" y2="168.5625"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L4" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L4" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1494.5,193.6953,1504.5,197.6953,1494.5,201.6953,1498.5,197.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1146.5" x2="1500.5" y1="197.6953" y2="197.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="1153.5" y="192.6294">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1846.5,222.8281,1856.5,226.8281,1846.5,230.8281,1850.5,226.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1516.5" x2="1852.5" y1="226.8281" y2="226.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="1523.5" y="221.7622">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20046/t20046.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="2106,236.8281,2116,240.8281,2106,244.8281,2110,240.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1868.5" x2="2112" y1="240.8281" y2="240.8281"/>
     </a>
diff --git a/docs/test_cases/t20047.md b/docs/test_cases/t20047.md
index a6e17c7b..6c620c45 100644
--- a/docs/test_cases/t20047.md
+++ b/docs/test_cases/t20047.md
@@ -73,6 +73,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20047::tmain()",
       "id": "395335809944376006",
       "name": "tmain",
       "namespace": "clanguml::t20047",
@@ -86,6 +87,7 @@ int tmain()
     },
     {
       "display_name": "a1(int)",
+      "full_name": "clanguml::t20047::a1(int)",
       "id": "1143426315383292679",
       "name": "a1",
       "namespace": "clanguml::t20047",
@@ -99,6 +101,7 @@ int tmain()
     },
     {
       "display_name": "a2(int)",
+      "full_name": "clanguml::t20047::a2(int)",
       "id": "642420844675776100",
       "name": "a2",
       "namespace": "clanguml::t20047",
@@ -112,6 +115,7 @@ int tmain()
     },
     {
       "display_name": "a3(int)",
+      "full_name": "clanguml::t20047::a3(int)",
       "id": "270462331062298387",
       "name": "a3",
       "namespace": "clanguml::t20047",
@@ -125,6 +129,7 @@ int tmain()
     },
     {
       "display_name": "a4(int)",
+      "full_name": "clanguml::t20047::a4(int)",
       "id": "128784832900379603",
       "name": "a4",
       "namespace": "clanguml::t20047",
@@ -138,6 +143,7 @@ int tmain()
     },
     {
       "display_name": "a5(int)",
+      "full_name": "clanguml::t20047::a5(int)",
       "id": "2182660880755444870",
       "name": "a5",
       "namespace": "clanguml::t20047",
@@ -151,6 +157,7 @@ int tmain()
     },
     {
       "display_name": "a6(int)",
+      "full_name": "clanguml::t20047::a6(int)",
       "id": "1272350614275781124",
       "name": "a6",
       "namespace": "clanguml::t20047",
diff --git a/docs/test_cases/t20047_sequence.svg b/docs/test_cases/t20047_sequence.svg
index ebcc8115..aa2e44f4 100644
--- a/docs/test_cases/t20047_sequence.svg
+++ b/docs/test_cases/t20047_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="266px" preserveAspectRatio="none" style="width:513px;height:266px;" version="1.1" viewBox="0 0 513 266" width="513px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dlhxld8lwsq8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fspi8n9tgvp6" 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(#f1dlhxld8lwsq8)" height="160" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="182" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="254" y="110.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="326" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="398" y="166.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="470" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="160" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="182" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="254" y="110.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="326" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="398" y="166.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="470" y="194.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="226.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="115" x2="115" y1="38.2969" y2="226.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="187" x2="187" y1="38.2969" y2="226.2969"/>
@@ -23,86 +23,86 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="331" x2="331" y1="38.2969" y2="226.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="403" x2="403" y1="38.2969" y2="226.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="475" x2="475" y1="38.2969" y2="226.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" 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(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="225.2969"/>
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="225.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="245.292">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L6" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L6" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L6" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L6" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="91" y="22.9951">a1(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="225.2969"/>
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="225.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="91" y="245.292">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L8" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L8" xlink:show="new" xlink:title="a2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="156" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L8" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L8" xlink:show="new" xlink:title="a2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="156" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="163" y="22.9951">a2(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="156" y="225.2969"/>
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="156" y="225.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="163" y="245.292">a2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L10" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L10" xlink:show="new" xlink:title="a3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="228" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L10" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L10" xlink:show="new" xlink:title="a3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="228" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="235" y="22.9951">a3(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="228" y="225.2969"/>
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="228" y="225.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="235" y="245.292">a3(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L12" target="_top" title="a4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L12" xlink:show="new" xlink:title="a4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="300" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L12" target="_top" title="a4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L12" xlink:show="new" xlink:title="a4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="300" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="307" y="22.9951">a4(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="300" y="225.2969"/>
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="300" y="225.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="307" y="245.292">a4(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L14" target="_top" title="a5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L14" xlink:show="new" xlink:title="a5" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="372" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L14" target="_top" title="a5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L14" xlink:show="new" xlink:title="a5" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="372" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="379" y="22.9951">a5(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="372" y="225.2969"/>
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="372" y="225.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="379" y="245.292">a5(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L16" target="_top" title="a6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L16" xlink:show="new" xlink:title="a6" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="444" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L16" target="_top" title="a6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L16" xlink:show="new" xlink:title="a6" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="444" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="451" y="22.9951">a6(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1dlhxld8lwsq8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="444" y="225.2969"/>
+      <rect fill="#FEFECE" filter="url(#fspi8n9tgvp6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="444" y="225.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="451" y="245.292">a6(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="160" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="182" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="254" y="110.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="326" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="398" y="166.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1dlhxld8lwsq8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="470" y="194.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="160" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="182" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="254" y="110.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="326" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="398" y="166.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fspi8n9tgvp6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="470" y="194.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,50.2969,108,54.2969,98,58.2969,102,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="104" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="57,64.2969,47,68.2969,57,72.2969,53,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="114" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="170,78.2969,180,82.2969,170,86.2969,174,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="176" y1="82.2969" y2="82.2969"/>
     </a>
     <polygon fill="#A80036" points="57,92.2969,47,96.2969,57,100.2969,53,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="186" y1="96.2969" y2="96.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="242,106.2969,252,110.2969,242,114.2969,246,110.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="248" y1="110.2969" y2="110.2969"/>
     </a>
     <polygon fill="#A80036" points="57,120.2969,47,124.2969,57,128.2969,53,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="258" y1="124.2969" y2="124.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="314,134.2969,324,138.2969,314,142.2969,318,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="320" y1="138.2969" y2="138.2969"/>
     </a>
     <polygon fill="#A80036" points="57,148.2969,47,152.2969,57,156.2969,53,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="330" y1="152.2969" y2="152.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="386,162.2969,396,166.2969,386,170.2969,390,166.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="392" y1="166.2969" y2="166.2969"/>
     </a>
     <polygon fill="#A80036" points="57,176.2969,47,180.2969,57,184.2969,53,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="402" y1="180.2969" y2="180.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20047/t20047.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20047/t20047.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="458,190.2969,468,194.2969,458,198.2969,462,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="464" y1="194.2969" y2="194.2969"/>
     </a>
diff --git a/docs/test_cases/t20048.md b/docs/test_cases/t20048.md
index abb86ddb..69e475ab 100644
--- a/docs/test_cases/t20048.md
+++ b/docs/test_cases/t20048.md
@@ -72,6 +72,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20048::tmain()",
       "id": "1438172520221545830",
       "name": "tmain",
       "namespace": "clanguml::t20048",
@@ -85,6 +86,7 @@ int tmain()
     },
     {
       "display_name": "a3(int)",
+      "full_name": "clanguml::t20048::a3(int)",
       "id": "1592723040639512239",
       "name": "a3",
       "namespace": "clanguml::t20048",
@@ -98,6 +100,7 @@ int tmain()
     },
     {
       "display_name": "a2(int)",
+      "full_name": "clanguml::t20048::a2(int)",
       "id": "1494883525267049301",
       "name": "a2",
       "namespace": "clanguml::t20048",
@@ -111,6 +114,7 @@ int tmain()
     },
     {
       "display_name": "a1(int)",
+      "full_name": "clanguml::t20048::a1(int)",
       "id": "1139681416936587734",
       "name": "a1",
       "namespace": "clanguml::t20048",
@@ -126,6 +130,7 @@ int tmain()
       "activities": [
         {
           "display_name": "operator()(auto &&) const",
+          "full_name": "clanguml::t20048::tmain()::(lambda t20048.cc:26:11)::operator()(auto &&) const",
           "id": "1272214062049882942",
           "name": "operator()",
           "namespace": "",
@@ -133,6 +138,7 @@ int tmain()
         }
       ],
       "display_name": "tmain()::(lambda t20048.cc:26:11)",
+      "full_name": "clanguml::t20048::tmain()::(lambda t20048.cc:26:11)",
       "id": "794500632550538124",
       "name": "tmain()::(lambda t20048.cc:26:11)",
       "namespace": "clanguml::t20048",
@@ -146,6 +152,7 @@ int tmain()
     },
     {
       "display_name": "a4(int)",
+      "full_name": "clanguml::t20048::a4(int)",
       "id": "986710377344543262",
       "name": "a4",
       "namespace": "clanguml::t20048",
@@ -159,6 +166,7 @@ int tmain()
     },
     {
       "display_name": "a6(int)",
+      "full_name": "clanguml::t20048::a6(int)",
       "id": "372194568810958399",
       "name": "a6",
       "namespace": "clanguml::t20048",
@@ -172,6 +180,7 @@ int tmain()
     },
     {
       "display_name": "a5(int)",
+      "full_name": "clanguml::t20048::a5(int)",
       "id": "473170110460301705",
       "name": "a5",
       "namespace": "clanguml::t20048",
@@ -185,6 +194,7 @@ int tmain()
     },
     {
       "display_name": "a7(int)",
+      "full_name": "clanguml::t20048::a7(int)",
       "id": "156504678810211848",
       "name": "a7",
       "namespace": "clanguml::t20048",
diff --git a/docs/test_cases/t20048_sequence.svg b/docs/test_cases/t20048_sequence.svg
index 904b22ab..2aa247f5 100644
--- a/docs/test_cases/t20048_sequence.svg
+++ b/docs/test_cases/t20048_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="578px" preserveAspectRatio="none" style="width:930px;height:578px;" version="1.1" viewBox="0 0 930 578" width="930px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1p87lr5bui5bu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fvu18roh0ksac" 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,15 +9,15 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="472.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="115" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="189" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="261" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="333" y="164.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="502" y="261.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="671" y="275.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="743" y="357.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="815" y="439.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="887" y="506.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="472.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="115" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="189" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="261" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="333" y="164.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="502" y="261.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="671" y="275.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="743" y="357.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="815" y="439.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="887" y="506.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="120" x2="120" y1="38.2969" y2="538.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="194" x2="194" y1="38.2969" y2="538.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="266" x2="266" y1="38.2969" y2="538.4922"/>
@@ -27,101 +27,101 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="748" x2="748" y1="38.2969" y2="538.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="820" x2="820" y1="38.2969" y2="538.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="892" x2="892" y1="38.2969" y2="538.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="87" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="87" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="94" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="87" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="87" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="94" y="557.4873">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L10" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L10" xlink:show="new" xlink:title="a3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L10" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L10" xlink:show="new" xlink:title="a3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="170" y="22.9951">a3(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="163" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="163" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="170" y="557.4873">a3(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L8" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L8" xlink:show="new" xlink:title="a2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="235" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L8" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L8" xlink:show="new" xlink:title="a2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="235" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="242" y="22.9951">a2(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="235" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="235" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="242" y="557.4873">a2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L6" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L6" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="307" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L6" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L6" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="307" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="314" y="22.9951">a1(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="307" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="307" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="314" y="557.4873">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L26" target="_top" title="tmain()##(lambda t20048.cc:26:11)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L26" xlink:show="new" xlink:title="tmain()##(lambda t20048.cc:26:11)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="379" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L26" target="_top" title="tmain()##(lambda t20048.cc:26:11)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L26" xlink:show="new" xlink:title="tmain()##(lambda t20048.cc:26:11)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="379" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="386" y="22.9951">tmain()::(lambda t20048.cc:26:11)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="379" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="379" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="238" x="386" y="557.4873">tmain()::(lambda t20048.cc:26:11)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L12" target="_top" title="a4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L12" xlink:show="new" xlink:title="a4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="645" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L12" target="_top" title="a4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L12" xlink:show="new" xlink:title="a4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="645" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="652" y="22.9951">a4(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="645" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="645" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="652" y="557.4873">a4(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L16" target="_top" title="a6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L16" xlink:show="new" xlink:title="a6" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="717" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L16" target="_top" title="a6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L16" xlink:show="new" xlink:title="a6" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="717" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="724" y="22.9951">a6(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="717" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="717" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="724" y="557.4873">a6(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L14" target="_top" title="a5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L14" xlink:show="new" xlink:title="a5" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="789" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L14" target="_top" title="a5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L14" xlink:show="new" xlink:title="a5" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="789" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="796" y="22.9951">a5(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="789" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="789" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="796" y="557.4873">a5(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L18" target="_top" title="a7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L18" xlink:show="new" xlink:title="a7" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="861" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L18" target="_top" title="a7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L18" xlink:show="new" xlink:title="a7" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="861" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="868" y="22.9951">a7(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1p87lr5bui5bu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="861" y="537.4922"/>
+      <rect fill="#FEFECE" filter="url(#fvu18roh0ksac)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="861" y="537.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="868" y="557.4873">a7(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="472.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="115" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="189" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="261" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="333" y="164.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="502" y="261.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="671" y="275.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="743" y="357.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="815" y="439.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1p87lr5bui5bu)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="887" y="506.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="472.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="115" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="189" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="261" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="333" y="164.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="502" y="261.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="671" y="275.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="743" y="357.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="815" y="439.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fvu18roh0ksac)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="887" y="506.4922"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="177,50.2969,187,54.2969,177,58.2969,181,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="183" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="136,64.2969,126,68.2969,136,72.2969,132,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="130" x2="193" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="249,78.2969,259,82.2969,249,86.2969,253,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="255" y1="82.2969" y2="82.2969"/>
     </a>
     <polygon fill="#A80036" points="136,92.2969,126,96.2969,136,100.2969,132,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="130" x2="265" y1="96.2969" y2="96.2969"/>
-    <path d="M23,109.2969 L23,149.2969 L213,149.2969 L213,119.2969 L203,109.2969 L23,109.2969 " fill="#FBFB77" filter="url(#f1p87lr5bui5bu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M23,109.2969 L23,149.2969 L213,149.2969 L213,119.2969 L203,109.2969 L23,109.2969 " fill="#FBFB77" filter="url(#fvu18roh0ksac)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M203,109.2969 L203,119.2969 L213,119.2969 L203,109.2969 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="29" y="126.3638">a1() adds `1` to the result</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="29" y="141.4966">of a2()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="321,160.5625,331,164.5625,321,168.5625,325,164.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="327" y1="164.5625" y2="164.5625"/>
     </a>
     <polygon fill="#A80036" points="136,174.5625,126,178.5625,136,182.5625,132,178.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="130" x2="337" y1="178.5625" y2="178.5625"/>
-    <path d="M18,191.5625 L18,231.5625 L217,231.5625 L217,201.5625 L207,191.5625 L18,191.5625 " fill="#FBFB77" filter="url(#f1p87lr5bui5bu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M18,191.5625 L18,231.5625 L217,231.5625 L217,201.5625 L207,191.5625 L18,191.5625 " fill="#FBFB77" filter="url(#fvu18roh0ksac)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M207,191.5625 L207,201.5625 L217,201.5625 L207,191.5625 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="178" x="24" y="208.6294">This lambda calls a4() which</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="163" x="24" y="223.7622">adds `4` to it's argument</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="490,257.9609,500,261.9609,490,265.9609,494,261.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="496" y1="261.9609" y2="261.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="132" y="256.895">operator()(auto &amp;&amp;) const</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="659,271.9609,669,275.9609,659,279.9609,663,275.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="512" x2="665" y1="275.9609" y2="275.9609"/>
     </a>
@@ -129,29 +129,29 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="517" x2="675" y1="289.9609" y2="289.9609"/>
     <polygon fill="#A80036" points="136,299.9609,126,303.9609,136,307.9609,132,303.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="130" x2="506" y1="303.9609" y2="303.9609"/>
-    <path d="M12,316.9609 L12,341.9609 L223,341.9609 L223,326.9609 L213,316.9609 L12,316.9609 " fill="#FBFB77" filter="url(#f1p87lr5bui5bu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M12,316.9609 L12,341.9609 L223,341.9609 L223,326.9609 L213,316.9609 L12,316.9609 " fill="#FBFB77" filter="url(#fvu18roh0ksac)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M213,316.9609 L213,326.9609 L223,326.9609 L213,316.9609 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="190" x="18" y="334.0278">a6() adds `1` to its argument</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="731,353.0938,741,357.0938,731,361.0938,735,357.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="737" y1="357.0938" y2="357.0938"/>
     </a>
     <polygon fill="#A80036" points="136,367.0938,126,371.0938,136,375.0938,132,371.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="130" x2="747" y1="371.0938" y2="371.0938"/>
-    <path d="M23,384.0938 L23,424.0938 L213,424.0938 L213,394.0938 L203,384.0938 L23,384.0938 " fill="#FBFB77" filter="url(#f1p87lr5bui5bu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M23,384.0938 L23,424.0938 L213,424.0938 L213,394.0938 L203,384.0938 L23,384.0938 " fill="#FBFB77" filter="url(#fvu18roh0ksac)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M203,384.0938 L203,394.0938 L213,394.0938 L203,384.0938 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="169" x="29" y="401.1606">a5() adds `1` to the result</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="29" y="416.2935">of a6()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="803,435.3594,813,439.3594,803,443.3594,807,439.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="809" y1="439.3594" y2="439.3594"/>
     </a>
     <polygon fill="#A80036" points="136,449.3594,126,453.3594,136,457.3594,132,453.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="130" x2="819" y1="453.3594" y2="453.3594"/>
-    <path d="M8,466.3594 L8,491.3594 L229,491.3594 L229,476.3594 L219,466.3594 L8,466.3594 " fill="#FBFB77" filter="url(#f1p87lr5bui5bu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M8,466.3594 L8,491.3594 L229,491.3594 L229,476.3594 L219,466.3594 L8,466.3594 " fill="#FBFB77" filter="url(#fvu18roh0ksac)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M219,466.3594 L219,476.3594 L229,476.3594 L219,466.3594 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="200" x="14" y="483.4263">a7() is called via add std::async</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20048/t20048.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20048/t20048.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="875,502.4922,885,506.4922,875,510.4922,879,506.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="881" y1="506.4922" y2="506.4922"/>
     </a>
diff --git a/docs/test_cases/t20049.md b/docs/test_cases/t20049.md
index 0064a468..ec5e04eb 100644
--- a/docs/test_cases/t20049.md
+++ b/docs/test_cases/t20049.md
@@ -80,6 +80,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20049::tmain()",
       "id": "1498198764898287853",
       "name": "tmain",
       "namespace": "clanguml::t20049",
@@ -93,6 +94,7 @@ int tmain()
     },
     {
       "display_name": "vector_square_add(float *,float *,float *,int)",
+      "full_name": "clanguml::t20049::vector_square_add(float *,float *,float *,int)",
       "id": "1998596618150288680",
       "is_cuda_kernel": true,
       "name": "vector_square_add",
@@ -107,6 +109,7 @@ int tmain()
     },
     {
       "display_name": "square(float)",
+      "full_name": "clanguml::t20049::square(float)",
       "id": "817124001270348685",
       "is_cuda_device": true,
       "name": "square",
@@ -121,6 +124,7 @@ int tmain()
     },
     {
       "display_name": "add<float>(float,float)",
+      "full_name": "clanguml::t20049::add<float>(float,float)",
       "id": "1897367040611447556",
       "is_cuda_device": true,
       "name": "add",
diff --git a/docs/test_cases/t20049_sequence.svg b/docs/test_cases/t20049_sequence.svg
index 12acc402..4eb6d9ff 100644
--- a/docs/test_cases/t20049_sequence.svg
+++ b/docs/test_cases/t20049_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="260px" preserveAspectRatio="none" style="width:731px;height:260px;" version="1.1" viewBox="0 0 731 260" width="731px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fy0anveajzmfj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1djucua37jcfl" 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,71 +9,71 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="129.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="123.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="108.7266"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="136.7266"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="620.5" y="164.7266"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="101.1328" style="stroke: #000000; stroke-width: 2.0;" width="646" x="74" y="85.5938"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="129.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="123.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="108.7266"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="136.7266"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="620.5" y="164.7266"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="101.1328" style="stroke: #000000; stroke-width: 2.0;" width="646" x="74" y="85.5938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="54.5938" y2="203.7266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="238" x2="238" y1="54.5938" y2="203.7266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="466" x2="466" y1="54.5938" y2="203.7266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="625" x2="625" y1="54.5938" y2="203.7266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="19.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="19.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="39.292">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="202.7266"/>
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="202.7266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="222.7217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L10" target="_top" title="vector_square_add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L10" xlink:show="new" xlink:title="vector_square_add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L10" target="_top" title="vector_square_add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L10" xlink:show="new" xlink:title="vector_square_add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="107" x="182.5" y="22.9951">«CUDA Kernel»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="290" x="91" y="39.292">vector_square_add(float *,float *,float *,int)</text>
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="202.7266"/>
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="202.7266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="107" x="182.5" y="222.7217">«CUDA Kernel»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="290" x="91" y="239.0186">vector_square_add(float *,float *,float *,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L8" target="_top" title="square" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L8" xlink:show="new" xlink:title="square" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="402" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L8" target="_top" title="square" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L8" xlink:show="new" xlink:title="square" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="402" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="111" x="409" y="22.9951">«CUDA Device»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="87" x="421" y="39.292">square(float)</text>
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="402" y="202.7266"/>
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="402" y="202.7266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="111" x="409" y="222.7217">«CUDA Device»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="87" x="421" y="239.0186">square(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cuh#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cuh#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="541" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cuh#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cuh#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="541" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="111" x="568" y="22.9951">«CUDA Device»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="151" x="548" y="39.292">add&lt;float&gt;(float,float)</text>
-      <rect fill="#FEFECE" filter="url(#fy0anveajzmfj)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="541" y="202.7266"/>
+      <rect fill="#FEFECE" filter="url(#f1djucua37jcfl)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="165" x="541" y="202.7266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="111" x="568" y="222.7217">«CUDA Device»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="151" x="548" y="239.0186">add&lt;float&gt;(float,float)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="129.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="123.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="108.7266"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="136.7266"/>
-    <rect fill="#FFFFFF" filter="url(#fy0anveajzmfj)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="620.5" y="164.7266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="129.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="123.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="108.7266"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="461.5" y="136.7266"/>
+    <rect fill="#FFFFFF" filter="url(#f1djucua37jcfl)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="620.5" y="164.7266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="221,66.5938,231,70.5938,221,74.5938,225,70.5938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="227" y1="70.5938" y2="70.5938"/>
     </a>
     <path d="M74,85.5938 L151,85.5938 L151,92.5938 L141,102.5938 L74,102.5938 L74,85.5938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="101.1328" style="stroke: #000000; stroke-width: 2.0;" width="646" x="74" y="85.5938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="89" y="98.6606">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="449.5,104.7266,459.5,108.7266,449.5,112.7266,453.5,108.7266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243" x2="455.5" y1="108.7266" y2="108.7266"/>
     </a>
     <polygon fill="#A80036" points="254,118.7266,244,122.7266,254,126.7266,250,122.7266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="248" x2="465.5" y1="122.7266" y2="122.7266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="449.5,132.7266,459.5,136.7266,449.5,140.7266,453.5,136.7266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243" x2="455.5" y1="136.7266" y2="136.7266"/>
     </a>
     <polygon fill="#A80036" points="254,146.7266,244,150.7266,254,154.7266,250,150.7266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="248" x2="465.5" y1="150.7266" y2="150.7266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20049/t20049.cu#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20049/t20049.cu#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="608.5,160.7266,618.5,164.7266,608.5,168.7266,612.5,164.7266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="243" x2="614.5" y1="164.7266" y2="164.7266"/>
     </a>
diff --git a/docs/test_cases/t20050.md b/docs/test_cases/t20050.md
index e53b500f..3cc25418 100644
--- a/docs/test_cases/t20050.md
+++ b/docs/test_cases/t20050.md
@@ -82,6 +82,7 @@ int tmain()
       "activities": [
         {
           "display_name": "tmain()",
+          "full_name": "clanguml::t20050::tmain()",
           "id": "1047834785038011964",
           "name": "tmain",
           "namespace": "clanguml::t20050",
@@ -95,6 +96,7 @@ int tmain()
         },
         {
           "display_name": "vector_square_add(float *,float *,float *,int)",
+          "full_name": "clanguml::t20050::vector_square_add(float *,float *,float *,int)",
           "id": "100545266160871109",
           "is_cuda_kernel": true,
           "name": "vector_square_add",
@@ -109,6 +111,7 @@ int tmain()
         },
         {
           "display_name": "square(float)",
+          "full_name": "clanguml::t20050::square(float)",
           "id": "193263048716247783",
           "is_cuda_device": true,
           "name": "square",
@@ -123,6 +126,7 @@ int tmain()
         },
         {
           "display_name": "add<float>(float,float)",
+          "full_name": "clanguml::t20050::add<float>(float,float)",
           "id": "60344909513106774",
           "is_cuda_device": true,
           "name": "add",
@@ -137,6 +141,7 @@ int tmain()
         }
       ],
       "display_name": "t20050.cu",
+      "full_name": "clanguml::t20050::tmain()",
       "id": "551473340136355806",
       "name": "t20050.cu",
       "namespace": "clanguml::t20050",
diff --git a/docs/test_cases/t20050_sequence.svg b/docs/test_cases/t20050_sequence.svg
index a96cf116..1acd0dc1 100644
--- a/docs/test_cases/t20050_sequence.svg
+++ b/docs/test_cases/t20050_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="482px" preserveAspectRatio="none" style="width:380px;height:482px;" version="1.1" viewBox="0 0 380 482" width="380px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffsohbso90rzx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f151g47q7ghuyv" 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,26 +9,26 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="355.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="296.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="74" y="121.6953"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="203.0938"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="287.3594"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="371.625"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="269.9297" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="19.5" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="355.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="296.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="74" y="121.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="203.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="287.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="371.625"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="269.9297" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="19.5" y="141.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="73.5" x2="73.5" y1="38.2969" y2="442.625"/>
-    <rect fill="#FEFECE" filter="url(#ffsohbso90rzx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="29.5" y="3"/>
+    <rect fill="#FEFECE" filter="url(#f151g47q7ghuyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="29.5" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="71" x="36.5" y="22.9951">t20050.cu</text>
-    <rect fill="#FEFECE" filter="url(#ffsohbso90rzx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="29.5" y="441.625"/>
+    <rect fill="#FEFECE" filter="url(#f151g47q7ghuyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="29.5" y="441.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="71" x="36.5" y="461.6201">t20050.cu</text>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="355.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="296.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="74" y="121.6953"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="203.0938"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="287.3594"/>
-    <rect fill="#FFFFFF" filter="url(#ffsohbso90rzx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="371.625"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="355.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="296.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="74" y="121.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="203.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="287.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f151g47q7ghuyv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="79" y="371.625"/>
     <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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="126" y1="108.6953" y2="108.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="126" x2="126" y1="108.6953" y2="121.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="85" x2="126" y1="121.6953" y2="121.6953"/>
@@ -39,7 +39,7 @@
     <path d="M19.5,141.6953 L96.5,141.6953 L96.5,148.6953 L86.5,158.6953 L19.5,158.6953 L19.5,141.6953 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="269.9297" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="19.5" y="141.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="34.5" y="154.7622">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="84" x2="131" y1="190.0938" y2="190.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="131" x2="131" y1="190.0938" y2="203.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="90" x2="131" y1="203.0938" y2="203.0938"/>
@@ -51,7 +51,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="131" x2="131" y1="227.0938" y2="240.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="131" y1="240.0938" y2="240.0938"/>
     <polygon fill="#A80036" points="94,236.0938,84,240.0938,94,244.0938,90,240.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="84" x2="131" y1="274.3594" y2="274.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="131" x2="131" y1="274.3594" y2="287.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="90" x2="131" y1="287.3594" y2="287.3594"/>
@@ -63,7 +63,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="131" x2="131" y1="311.3594" y2="324.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="131" y1="324.3594" y2="324.3594"/>
     <polygon fill="#A80036" points="94,320.3594,84,324.3594,94,328.3594,90,324.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20050/t20050.cu#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20050/t20050.cu#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="84" x2="131" y1="358.625" y2="358.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="131" x2="131" y1="358.625" y2="371.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="90" x2="131" y1="371.625" y2="371.625"/>
diff --git a/docs/test_cases/t20051.md b/docs/test_cases/t20051.md
index fab32475..ec7a5fef 100644
--- a/docs/test_cases/t20051.md
+++ b/docs/test_cases/t20051.md
@@ -82,6 +82,7 @@ __global__ void vector_square_add(float *out, float *a, float *b, int n);
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20051::tmain()",
       "id": "33004218577871304",
       "name": "tmain",
       "namespace": "clanguml::t20051",
@@ -95,6 +96,7 @@ __global__ void vector_square_add(float *out, float *a, float *b, int n);
     },
     {
       "display_name": "vector_square_add(float *,float *,float *,int)",
+      "full_name": "clanguml::t20051::vector_square_add(float *,float *,float *,int)",
       "id": "1972238512532321229",
       "is_cuda_kernel": true,
       "name": "vector_square_add",
diff --git a/docs/test_cases/t20051_sequence.svg b/docs/test_cases/t20051_sequence.svg
index 9b8b3eaf..3322275f 100644
--- a/docs/test_cases/t20051_sequence.svg
+++ b/docs/test_cases/t20051_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="175px" preserveAspectRatio="none" style="width:399px;height:175px;" version="1.1" viewBox="0 0 399 175" width="399px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1imcvcqpnxcw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fs05gwp4jmk4i" 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>
-    <rect fill="#FFFFFF" filter="url(#f1imcvcqpnxcw)" height="36" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
-    <rect fill="#FFFFFF" filter="url(#f1imcvcqpnxcw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
+    <rect fill="#FFFFFF" filter="url(#fs05gwp4jmk4i)" height="36" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
+    <rect fill="#FFFFFF" filter="url(#fs05gwp4jmk4i)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="54.5938" y2="118.5938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="238" x2="238" y1="54.5938" y2="118.5938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20051/t20051.cu#L19" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20051/t20051.cu#L19" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1imcvcqpnxcw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="19.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20051/t20051.cu#L19" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20051/t20051.cu#L19" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fs05gwp4jmk4i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="19.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="39.292">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1imcvcqpnxcw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="117.5938"/>
+      <rect fill="#FEFECE" filter="url(#fs05gwp4jmk4i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="117.5938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="137.5889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20051/t20051.cu#L12" target="_top" title="vector_square_add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20051/t20051.cu#L12" xlink:show="new" xlink:title="vector_square_add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1imcvcqpnxcw)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20051/t20051.cu#L12" target="_top" title="vector_square_add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20051/t20051.cu#L12" xlink:show="new" xlink:title="vector_square_add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fs05gwp4jmk4i)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="107" x="182.5" y="22.9951">«CUDA Kernel»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="290" x="91" y="39.292">vector_square_add(float *,float *,float *,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1imcvcqpnxcw)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="117.5938"/>
+      <rect fill="#FEFECE" filter="url(#fs05gwp4jmk4i)" height="46.5938" style="stroke: #A80036; stroke-width: 1.5;" width="304" x="84" y="117.5938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="107" x="182.5" y="137.5889">«CUDA Kernel»</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="290" x="91" y="153.8857">vector_square_add(float *,float *,float *,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1imcvcqpnxcw)" height="36" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
-    <rect fill="#FFFFFF" filter="url(#f1imcvcqpnxcw)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20051/t20051.cu#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20051/t20051.cu#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fs05gwp4jmk4i)" height="36" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="64.5938"/>
+    <rect fill="#FFFFFF" filter="url(#fs05gwp4jmk4i)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="233" y="70.5938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20051/t20051.cu#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20051/t20051.cu#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="221,66.5938,231,70.5938,221,74.5938,225,70.5938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="227" y1="70.5938" y2="70.5938"/>
     </a>
diff --git a/docs/test_cases/t20052.md b/docs/test_cases/t20052.md
index e2f2bd5b..6653a309 100644
--- a/docs/test_cases/t20052.md
+++ b/docs/test_cases/t20052.md
@@ -135,6 +135,7 @@ void tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20052::tmain()",
       "id": "1863374927109937538",
       "name": "tmain",
       "namespace": "clanguml::t20052",
@@ -150,6 +151,7 @@ void tmain()
       "activities": [
         {
           "display_name": "a()",
+          "full_name": "clanguml::t20052::A::a()",
           "id": "1226536010860143477",
           "name": "a",
           "namespace": "",
@@ -163,6 +165,7 @@ void tmain()
         },
         {
           "display_name": "aa()",
+          "full_name": "clanguml::t20052::A::aa()",
           "id": "152397826074008213",
           "name": "aa",
           "namespace": "",
@@ -176,6 +179,7 @@ void tmain()
         },
         {
           "display_name": "aaa()",
+          "full_name": "clanguml::t20052::A::aaa()",
           "id": "1337804153305761200",
           "name": "aaa",
           "namespace": "",
@@ -189,6 +193,7 @@ void tmain()
         }
       ],
       "display_name": "A",
+      "full_name": "clanguml::t20052::A",
       "id": "1703104288786661165",
       "name": "A",
       "namespace": "clanguml::t20052",
@@ -204,6 +209,7 @@ void tmain()
       "activities": [
         {
           "display_name": "b()",
+          "full_name": "clanguml::t20052::B::b()",
           "id": "319515743780574134",
           "name": "b",
           "namespace": "",
@@ -217,6 +223,7 @@ void tmain()
         },
         {
           "display_name": "bb()",
+          "full_name": "clanguml::t20052::B::bb()",
           "id": "647068274411777494",
           "name": "bb",
           "namespace": "",
@@ -230,6 +237,7 @@ void tmain()
         },
         {
           "display_name": "bbb()",
+          "full_name": "clanguml::t20052::B::bbb()",
           "id": "849373810301162421",
           "name": "bbb",
           "namespace": "",
@@ -243,6 +251,7 @@ void tmain()
         }
       ],
       "display_name": "B",
+      "full_name": "clanguml::t20052::B",
       "id": "1858368487431426893",
       "name": "B",
       "namespace": "clanguml::t20052",
@@ -258,6 +267,7 @@ void tmain()
       "activities": [
         {
           "display_name": "c()",
+          "full_name": "clanguml::t20052::C::c()",
           "id": "286735272236693235",
           "name": "c",
           "namespace": "",
@@ -271,6 +281,7 @@ void tmain()
         },
         {
           "display_name": "cc()",
+          "full_name": "clanguml::t20052::C::cc()",
           "id": "927328030188215717",
           "name": "cc",
           "namespace": "",
@@ -284,6 +295,7 @@ void tmain()
         },
         {
           "display_name": "ccc()",
+          "full_name": "clanguml::t20052::C::ccc()",
           "id": "733299138189220355",
           "name": "ccc",
           "namespace": "",
@@ -297,6 +309,7 @@ void tmain()
         }
       ],
       "display_name": "C",
+      "full_name": "clanguml::t20052::C",
       "id": "695917114097253548",
       "name": "C",
       "namespace": "clanguml::t20052",
@@ -312,6 +325,7 @@ void tmain()
       "activities": [
         {
           "display_name": "R((lambda at t20052.cc:86:9) &&)",
+          "full_name": "clanguml::t20052::R<(lambda at t20052.cc:86:9)>::R((lambda at t20052.cc:86:9) &&)",
           "id": "1771911385519841377",
           "name": "R",
           "namespace": "",
@@ -325,6 +339,7 @@ void tmain()
         },
         {
           "display_name": "r()",
+          "full_name": "clanguml::t20052::R<(lambda at t20052.cc:86:9)>::r()",
           "id": "1643468997390681958",
           "name": "r",
           "namespace": "",
@@ -338,6 +353,7 @@ void tmain()
         }
       ],
       "display_name": "R<(lambda at t20052.cc:86:9)>",
+      "full_name": "clanguml::t20052::R<(lambda at t20052.cc:86:9)>",
       "id": "548336024237507357",
       "name": "R",
       "namespace": "clanguml::t20052",
@@ -353,6 +369,7 @@ void tmain()
       "activities": [
         {
           "display_name": "add5(int) const",
+          "full_name": "clanguml::t20052::D::add5(int) const",
           "id": "2099569549236534730",
           "name": "add5",
           "namespace": "",
@@ -366,6 +383,7 @@ void tmain()
         }
       ],
       "display_name": "D",
+      "full_name": "clanguml::t20052::D",
       "id": "1091266475405978871",
       "name": "D",
       "namespace": "clanguml::t20052",
@@ -581,6 +599,46 @@ void tmain()
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "1226536010860143477",
+            "participant_id": "1703104288786661165"
+          },
+          "name": "aa()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 16,
+            "file": "t20052.cc",
+            "line": 11,
+            "translation_unit": "t20052.cc"
+          },
+          "to": {
+            "activity_id": "152397826074008213",
+            "participant_id": "1703104288786661165"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "152397826074008213",
+            "participant_id": "1703104288786661165"
+          },
+          "name": "aaa()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 17,
+            "file": "t20052.cc",
+            "line": 13,
+            "translation_unit": "t20052.cc"
+          },
+          "to": {
+            "activity_id": "1337804153305761200",
+            "participant_id": "1703104288786661165"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "1863374927109937538",
@@ -601,6 +659,46 @@ void tmain()
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "319515743780574134",
+            "participant_id": "1858368487431426893"
+          },
+          "name": "bb()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 16,
+            "file": "t20052.cc",
+            "line": 19,
+            "translation_unit": "t20052.cc"
+          },
+          "to": {
+            "activity_id": "647068274411777494",
+            "participant_id": "1858368487431426893"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "647068274411777494",
+            "participant_id": "1858368487431426893"
+          },
+          "name": "bbb()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 17,
+            "file": "t20052.cc",
+            "line": 21,
+            "translation_unit": "t20052.cc"
+          },
+          "to": {
+            "activity_id": "849373810301162421",
+            "participant_id": "1858368487431426893"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "1863374927109937538",
@@ -661,6 +759,46 @@ void tmain()
           },
           "type": "message"
         },
+        {
+          "from": {
+            "activity_id": "286735272236693235",
+            "participant_id": "695917114097253548"
+          },
+          "name": "cc()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 16,
+            "file": "t20052.cc",
+            "line": 29,
+            "translation_unit": "t20052.cc"
+          },
+          "to": {
+            "activity_id": "927328030188215717",
+            "participant_id": "695917114097253548"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "927328030188215717",
+            "participant_id": "695917114097253548"
+          },
+          "name": "ccc()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "column": 17,
+            "file": "t20052.cc",
+            "line": 31,
+            "translation_unit": "t20052.cc"
+          },
+          "to": {
+            "activity_id": "733299138189220355",
+            "participant_id": "695917114097253548"
+          },
+          "type": "message"
+        },
         {
           "from": {
             "activity_id": "1863374927109937538",
diff --git a/docs/test_cases/t20052_sequence.svg b/docs/test_cases/t20052_sequence.svg
index f571b552..15dfb7cc 100644
--- a/docs/test_cases/t20052_sequence.svg
+++ b/docs/test_cases/t20052_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="1090px" preserveAspectRatio="none" style="width:533px;height:1090px;" version="1.1" viewBox="0 0 533 1090" width="533px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hk1yx5shsgwn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fv2j91h0d2yzd" 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,217 +9,217 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="983.7891" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="148.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="499.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="578.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="212.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="249.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="292.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="643.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="680.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="722.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="356.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="393.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="435.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="874.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="911.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="953.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="786.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="845.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="507" y="1018.0859"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="983.7891" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="148.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="499.625"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="578.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="212.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="249.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="292.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="643.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="680.1563"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="722.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="356.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="393.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="435.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="874.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="911.8203"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="953.9531"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="786.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="845.5547"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="507" y="1018.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1050.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="1050.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="160.5" x2="160.5" y1="38.2969" y2="1050.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="223.5" x2="223.5" y1="38.2969" y2="1050.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="367.5" x2="367.5" y1="38.2969" y2="1050.0859"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="511.5" x2="511.5" y1="38.2969" y2="1050.0859"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L59" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L59" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" 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(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1049.0859"/>
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1049.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1069.0811">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" 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(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="1049.0859"/>
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="1049.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="1069.0811">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="146.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="146.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="153.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="146.5" y="1049.0859"/>
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="146.5" y="1049.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="153.5" y="1069.0811">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="209.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="209.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="216.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="209.5" y="1049.0859"/>
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="209.5" y="1049.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="216.5" y="1069.0811">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="247.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L48" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L48" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="247.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="222" x="254.5" y="22.9951">R&lt;(lambda at t20052.cc:86:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="247.5" y="1049.0859"/>
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="236" x="247.5" y="1049.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="222" x="254.5" y="1069.0811">R&lt;(lambda at t20052.cc:86:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="497.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="497.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="504.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f1hk1yx5shsgwn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="497.5" y="1049.0859"/>
+      <rect fill="#FEFECE" filter="url(#fv2j91h0d2yzd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="497.5" y="1049.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="504.5" y="1069.0811">D</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="983.7891" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="148.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="499.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="536.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="578.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="212.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="249.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="292.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="643.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="680.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="722.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="356.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="393.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="435.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="874.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="911.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="953.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="786.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="845.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1hk1yx5shsgwn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="507" y="1018.0859"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="983.7891" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="148.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="499.625"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="536.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="102.5" y="578.8906"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="212.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="249.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="292.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="155.5" y="643.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="160.5" y="680.1563"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="722.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="356.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="393.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="435.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218.5" y="874.6875"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="223.5" y="911.8203"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="228.5" y="953.9531"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="786.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="136.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="362.5" y="845.5547"/>
+    <rect fill="#FFFFFF" filter="url(#fv2j91h0d2yzd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="507" y="1018.0859"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L68" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="93.5625" y2="93.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="93.5625" y2="106.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="106.5625" y2="106.5625"/>
       <polygon fill="#A80036" points="118.5,102.5625,108.5,106.5625,118.5,110.5625,114.5,106.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="88.4966">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="112.5" x2="154.5" y1="140.6953" y2="140.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154.5" x2="154.5" y1="140.6953" y2="153.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="113.5" x2="154.5" y1="153.6953" y2="153.6953"/>
       <polygon fill="#A80036" points="123.5,149.6953,113.5,153.6953,123.5,157.6953,119.5,153.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="119.5" y="135.6294">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="143.5,208.8281,153.5,212.8281,143.5,216.8281,147.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="149.5" y1="212.8281" y2="212.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="207.7622">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="165.5" x2="212.5" y1="236.9609" y2="236.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="212.5" x2="212.5" y1="236.9609" y2="249.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="171.5" x2="212.5" y1="249.9609" y2="249.9609"/>
       <polygon fill="#A80036" points="181.5,245.9609,171.5,249.9609,181.5,253.9609,177.5,249.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="177.5" y="231.895">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="217.5" y1="284.0938" y2="284.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217.5" x2="217.5" y1="284.0938" y2="297.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176.5" x2="217.5" y1="297.0938" y2="297.0938"/>
       <polygon fill="#A80036" points="186.5,293.0938,176.5,297.0938,186.5,301.0938,182.5,297.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="182.5" y="279.0278">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206.5,352.2266,216.5,356.2266,206.5,360.2266,210.5,356.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="212.5" y1="356.2266" y2="356.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="53" y="351.1606">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228.5" x2="275.5" y1="380.3594" y2="380.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="275.5" x2="275.5" y1="380.3594" y2="393.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="234.5" x2="275.5" y1="393.3594" y2="393.3594"/>
       <polygon fill="#A80036" points="244.5,389.3594,234.5,393.3594,244.5,397.3594,240.5,393.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="240.5" y="375.2935">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="238.5" x2="280.5" y1="427.4922" y2="427.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="280.5" x2="280.5" y1="427.4922" y2="440.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239.5" x2="280.5" y1="440.4922" y2="440.4922"/>
       <polygon fill="#A80036" points="249.5,436.4922,239.5,440.4922,249.5,444.4922,245.5,440.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="245.5" y="422.4263">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,495.625,90.5,499.625,80.5,503.625,84.5,499.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="499.625" y2="499.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="494.5591">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="523.7578" y2="523.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="523.7578" y2="536.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="536.7578" y2="536.7578"/>
       <polygon fill="#A80036" points="118.5,532.7578,108.5,536.7578,118.5,540.7578,114.5,536.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="114.5" y="518.6919">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="112.5" x2="154.5" y1="570.8906" y2="570.8906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="154.5" x2="154.5" y1="570.8906" y2="583.8906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="113.5" x2="154.5" y1="583.8906" y2="583.8906"/>
       <polygon fill="#A80036" points="123.5,579.8906,113.5,583.8906,123.5,587.8906,119.5,583.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="119.5" y="565.8247">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="143.5,639.0234,153.5,643.0234,143.5,647.0234,147.5,643.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="149.5" y1="643.0234" y2="643.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="637.9575">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="165.5" x2="212.5" y1="667.1563" y2="667.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="212.5" x2="212.5" y1="667.1563" y2="680.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="171.5" x2="212.5" y1="680.1563" y2="680.1563"/>
       <polygon fill="#A80036" points="181.5,676.1563,171.5,680.1563,181.5,684.1563,177.5,680.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="177.5" y="662.0903">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="217.5" y1="714.2891" y2="714.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="217.5" x2="217.5" y1="714.2891" y2="727.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="176.5" x2="217.5" y1="727.2891" y2="727.2891"/>
       <polygon fill="#A80036" points="186.5,723.2891,176.5,727.2891,186.5,731.2891,182.5,727.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="182.5" y="709.2231">bbb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="350.5,782.4219,360.5,786.4219,350.5,790.4219,354.5,786.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="356.5" y1="786.4219" y2="786.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="218" x="53" y="781.356">R((lambda at t20052.cc:86:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L88" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L88" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="350.5,841.5547,360.5,845.5547,350.5,849.5547,354.5,845.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="356.5" y1="845.5547" y2="845.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="840.4888">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L86" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L86" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="239.5,870.6875,229.5,874.6875,239.5,878.6875,235.5,874.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="233.5" x2="361.5" y1="874.6875" y2="874.6875"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="245.5" y="869.6216">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L29" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L29" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228.5" x2="275.5" y1="898.8203" y2="898.8203"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="275.5" x2="275.5" y1="898.8203" y2="911.8203"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="234.5" x2="275.5" y1="911.8203" y2="911.8203"/>
       <polygon fill="#A80036" points="244.5,907.8203,234.5,911.8203,244.5,915.8203,240.5,911.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="240.5" y="893.7544">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="238.5" x2="280.5" y1="945.9531" y2="945.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="280.5" x2="280.5" y1="945.9531" y2="958.9531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="239.5" x2="280.5" y1="958.9531" y2="958.9531"/>
       <polygon fill="#A80036" points="249.5,954.9531,239.5,958.9531,249.5,962.9531,245.5,958.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="245.5" y="940.8872">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L94" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20052/t20052.cc#L94" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L94" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20052/t20052.cc#L94" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="495,1014.0859,505,1018.0859,495,1022.0859,499,1018.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="501" y1="1018.0859" y2="1018.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="97" x="53" y="1013.02">add5(int) const</text>
diff --git a/docs/test_cases/t20053.md b/docs/test_cases/t20053.md
index 82b4d6a4..017d3d29 100644
--- a/docs/test_cases/t20053.md
+++ b/docs/test_cases/t20053.md
@@ -58,6 +58,7 @@ int tmain()
   "participants": [
     {
       "display_name": "tmain()",
+      "full_name": "clanguml::t20053::tmain()",
       "id": "1989009774042525491",
       "name": "tmain",
       "namespace": "clanguml::t20053",
@@ -71,6 +72,7 @@ int tmain()
     },
     {
       "display_name": "a2(int)",
+      "full_name": "clanguml::t20053::a2(int)",
       "id": "670119640253232066",
       "name": "a2",
       "namespace": "clanguml::t20053",
@@ -83,7 +85,8 @@ int tmain()
       "type": "function"
     },
     {
-      "display_name": "a1<(lambda at t20053.cc:23:9)>((lambda at /home/bartek/devel/clang-uml/tests/t20053/t20053.cc:23:9) &&)",
+      "display_name": "a1<(lambda at t20053.cc:23:9)>((lambda at t20053.cc:23:9) &&)",
+      "full_name": "clanguml::t20053::a1<(lambda at t20053.cc:23:9)>((lambda at /home/bartek/devel/clang-uml/tests/t20053/t20053.cc:23:9) &&)",
       "id": "967684327663938310",
       "name": "a1",
       "namespace": "clanguml::t20053",
@@ -97,6 +100,7 @@ int tmain()
     },
     {
       "display_name": "a3(int)",
+      "full_name": "clanguml::t20053::a3(int)",
       "id": "1586707721117132930",
       "name": "a3",
       "namespace": "clanguml::t20053",
diff --git a/docs/test_cases/t20053_sequence.svg b/docs/test_cases/t20053_sequence.svg
index 436f632d..06a5807a 100644
--- a/docs/test_cases/t20053_sequence.svg
+++ b/docs/test_cases/t20053_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="182px" preserveAspectRatio="none" style="width:708px;height:182px;" version="1.1" viewBox="0 0 708 182" width="708px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6msqf8vfbsde" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f70lwtti4kis8" 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(#f6msqf8vfbsde)" height="76" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6msqf8vfbsde)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6msqf8vfbsde)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="387.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6msqf8vfbsde)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="665" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="76" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="387.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="665" y="96.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="142.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="115" x2="115" y1="38.2969" y2="142.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="392" x2="392" y1="38.2969" y2="142.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="670" x2="670" y1="38.2969" y2="142.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L9" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L9" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6msqf8vfbsde)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L9" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L9" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" 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(#f6msqf8vfbsde)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="141.2969"/>
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="141.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="161.292">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L5" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L5" xlink:show="new" xlink:title="a2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6msqf8vfbsde)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L5" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L5" xlink:show="new" xlink:title="a2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="91" y="22.9951">a2(int)</text>
-      <rect fill="#FEFECE" filter="url(#f6msqf8vfbsde)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="141.2969"/>
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="84" y="141.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="91" y="161.292">a2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L3" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L3" xlink:show="new" xlink:title="a1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6msqf8vfbsde)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="156" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L3" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L3" xlink:show="new" xlink:title="a1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="156" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="455" x="163" y="22.9951">a1&lt;(lambda at t20053.cc:23:9)&gt;((lambda at t20053.cc:23:9) &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f6msqf8vfbsde)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="156" y="141.2969"/>
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="469" x="156" y="141.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="455" x="163" y="161.292">a1&lt;(lambda at t20053.cc:23:9)&gt;((lambda at t20053.cc:23:9) &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L7" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L7" xlink:show="new" xlink:title="a3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6msqf8vfbsde)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="639" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L7" target="_top" title="a3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L7" xlink:show="new" xlink:title="a3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="639" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="646" y="22.9951">a3(int)</text>
-      <rect fill="#FEFECE" filter="url(#f6msqf8vfbsde)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="639" y="141.2969"/>
+      <rect fill="#FEFECE" filter="url(#f70lwtti4kis8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="639" y="141.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="646" y="161.292">a3(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f6msqf8vfbsde)" height="76" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6msqf8vfbsde)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6msqf8vfbsde)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="387.5" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f6msqf8vfbsde)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="665" y="96.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="76" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="110" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="387.5" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f70lwtti4kis8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="665" y="96.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="98,50.2969,108,54.2969,98,58.2969,102,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="104" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="57,64.2969,47,68.2969,57,72.2969,53,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="114" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="375.5,78.2969,385.5,82.2969,375.5,86.2969,379.5,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="381.5" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t20053/t20053.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t20053/t20053.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="653,92.2969,663,96.2969,653,100.2969,657,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="397.5" x2="659" y1="96.2969" y2="96.2969"/>
     </a>
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 77ad7870..d3a4d0c4 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="284px" preserveAspectRatio="none" style="width:854px;height:284px;" version="1.1" viewBox="0 0 854 284" width="854px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fjego2unzgi9c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15an2b5z234os" 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"/>
@@ -10,63 +10,63 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="282" x="292" y="16.708">Basic package diagram example</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="49,69.9531,66,69.9531,73,92.25,370,92.25,370,272.9531,49,272.9531,49,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="49,69.9531,66,69.9531,73,92.25,370,92.25,370,272.9531,49,272.9531,49,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="92.25" y2="92.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="84.9482">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="132,120.9531,160,120.9531,167,143.25,338,143.25,338,240.9531,132,240.9531,132,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="132,120.9531,160,120.9531,167,143.25,338,143.25,338,240.9531,132,240.9531,132,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="143.25" y2="143.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="135.9482">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="511,69.9531,527,69.9531,534,92.25,832,92.25,832,272.9531,511,272.9531,511,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="511,69.9531,527,69.9531,534,92.25,832,92.25,832,272.9531,511,272.9531,511,69.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="92.25" y2="92.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="84.9482">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="594,120.9531,622,120.9531,629,143.25,800,143.25,800,240.9531,594,240.9531,594,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="594,120.9531,622,120.9531,629,143.25,800,143.25,800,240.9531,594,240.9531,594,120.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="143.25" y2="143.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="135.9482">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="260.5,163.9531,299.5,163.9531,306.5,186.25,313.5,186.25,313.5,216.5469,260.5,216.5469,260.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="260.5,163.9531,299.5,163.9531,306.5,186.25,313.5,186.25,313.5,216.5469,260.5,216.5469,260.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="178.9482">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="175,163.9531,211,163.9531,218,186.25,225,186.25,225,216.5469,175,216.5469,175,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="175,163.9531,211,163.9531,218,186.25,225,186.25,225,216.5469,175,216.5469,175,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="178.9482">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="65,163.9531,91,163.9531,98,186.25,105,186.25,105,216.5469,65,216.5469,65,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="65,163.9531,91,163.9531,98,186.25,105,186.25,105,216.5469,65,216.5469,65,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="178.9482">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="722.5,163.9531,761.5,163.9531,768.5,186.25,775.5,186.25,775.5,216.5469,722.5,216.5469,722.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="722.5,163.9531,761.5,163.9531,768.5,186.25,775.5,186.25,775.5,216.5469,722.5,216.5469,722.5,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="178.9482">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="637,163.9531,673,163.9531,680,186.25,687,186.25,687,216.5469,637,216.5469,637,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="637,163.9531,673,163.9531,680,186.25,687,186.25,687,216.5469,637,216.5469,637,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="178.9482">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fjego2unzgi9c)" points="527,163.9531,553,163.9531,560,186.25,567,186.25,567,216.5469,527,216.5469,527,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f15an2b5z234os)" points="527,163.9531,553,163.9531,560,186.25,567,186.25,567,216.5469,527,216.5469,527,163.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="186.25" y2="186.25"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="178.9482">BB</text>
     </a>
-    <path d="M386,177.9531 L386,203.0859 L492,203.0859 L492,187.9531 L482,177.9531 L386,177.9531 " fill="#FBFB77" filter="url(#fjego2unzgi9c)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M386,177.9531 L386,203.0859 L492,203.0859 L492,187.9531 L482,177.9531 L386,177.9531 " fill="#FBFB77" filter="url(#f15an2b5z234os)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M482,177.9531 L482,187.9531 L492,187.9531 L482,177.9531 " 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="195.02">A AAA note...</text>
-    <path d="M6,28.9531 L6,54.0859 L274,54.0859 L274,38.9531 L264,28.9531 L6,28.9531 " fill="#FBFB77" filter="url(#fjego2unzgi9c)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,28.9531 L6,54.0859 L274,54.0859 L274,38.9531 L264,28.9531 L6,28.9531 " fill="#FBFB77" filter="url(#f15an2b5z234os)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M264,28.9531 L264,38.9531 L274,38.9531 L264,28.9531 " 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="46.02">This is namespace AA in namespace A</text>
-    <path d="M468,28.9531 L468,54.0859 L736,54.0859 L736,38.9531 L726,28.9531 L468,28.9531 " fill="#FBFB77" filter="url(#fjego2unzgi9c)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M468,28.9531 L468,54.0859 L736,54.0859 L736,38.9531 L726,28.9531 L468,28.9531 " fill="#FBFB77" filter="url(#f15an2b5z234os)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M726,28.9531 L726,38.9531 L736,38.9531 L726,28.9531 " 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="46.02">This is namespace AA in namespace B</text>
     <path d="M313.72,190.4531 C337.7,190.4531 361.68,190.4531 385.66,190.4531 " fill="none" id="C_0000274638237740249424-GMN1348" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index a1f50d06..895dfde2 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:1548px;height:402px;" version="1.1" viewBox="0 0 1548 402" width="1548px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1q90f2l3btalf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fad8fi1k9egf1" 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>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="22,219,39,219,46,241.2969,1526,241.2969,1526,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="46,262,74,262,81,284.2969,1502,284.2969,1502,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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L67" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="751,24,767,24,774,46.2969,881,46.2969,881,195,751,195,751,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="751" x2="774" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="755" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L67" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="775,67,801,67,808,89.2969,857,89.2969,857,171,775,171,775,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="775" x2="808" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="779" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="1444.5,297,1471.5,297,1478.5,319.2969,1485.5,319.2969,1485.5,349.5938,1444.5,349.5938,1444.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1444.5" x2="1478.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="1448.5" y="311.9951">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="1368.5,297,1395.5,297,1402.5,319.2969,1409.5,319.2969,1409.5,349.5938,1368.5,349.5938,1368.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1368.5" x2="1402.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="1372.5" y="311.9951">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="1292.5,297,1319.5,297,1326.5,319.2969,1333.5,319.2969,1333.5,349.5938,1292.5,349.5938,1292.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1292.5" x2="1326.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="1296.5" y="311.9951">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L21" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L21" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="1216.5,297,1243.5,297,1250.5,319.2969,1257.5,319.2969,1257.5,349.5938,1216.5,349.5938,1216.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1216.5" x2="1250.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="1220.5" y="311.9951">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L24" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L24" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="1140.5,297,1167.5,297,1174.5,319.2969,1181.5,319.2969,1181.5,349.5938,1140.5,349.5938,1140.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1140.5" x2="1174.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="1144.5" y="311.9951">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L27" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L27" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="1064.5,297,1091.5,297,1098.5,319.2969,1105.5,319.2969,1105.5,349.5938,1064.5,349.5938,1064.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1064.5" x2="1098.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="1068.5" y="311.9951">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L30" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="988.5,297,1015.5,297,1022.5,319.2969,1029.5,319.2969,1029.5,349.5938,988.5,349.5938,988.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="988.5" x2="1022.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="992.5" y="311.9951">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L33" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L33" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="912.5,297,939.5,297,946.5,319.2969,953.5,319.2969,953.5,349.5938,912.5,349.5938,912.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="912.5" x2="946.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="916.5" y="311.9951">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L36" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L36" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="836.5,297,863.5,297,870.5,319.2969,877.5,319.2969,877.5,349.5938,836.5,349.5938,836.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="836.5" x2="870.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="840.5" y="311.9951">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L39" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L39" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="750.5,297,787.5,297,794.5,319.2969,801.5,319.2969,801.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="794.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="754.5" y="311.9951">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L42" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L45" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L45" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L48" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L48" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L51" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L51" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L54" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L57" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L57" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L60" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L60" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L63" target="_top" title="A18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L63" xlink:show="new" xlink:title="A18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" 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">A18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q90f2l3btalf)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L67" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30002/t30002.cc#L67" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fad8fi1k9egf1)" points="791,102,827,102,834,124.2969,841,124.2969,841,154.5938,791,154.5938,791,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="791" x2="834" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="795" y="116.9951">BBB</text>
     </a>
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index 5350f351..3e6e3c13 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="351px" preserveAspectRatio="none" style="width:341px;height:351px;" version="1.1" viewBox="0 0 341 351" width="341px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1l7vxyl2f5rbb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wp43c19pnb3p" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1l7vxyl2f5rbb)" points="22,235,57,235,64,257.2969,319,257.2969,319,339,22,339,22,235" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wp43c19pnb3p)" points="22,235,57,235,64,257.2969,319,257.2969,319,339,22,339,22,235" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="257.2969" y2="257.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="249.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1l7vxyl2f5rbb)" points="183,24,218,24,225,46.2969,313,46.2969,313,211,183,211,183,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wp43c19pnb3p)" points="183,24,218,24,225,46.2969,313,46.2969,313,211,183,211,183,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="183" x2="225" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="187" y="38.9951">ns3</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="61.292">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1l7vxyl2f5rbb)" points="207,83,242,83,249,105.2969,289,105.2969,289,187,207,187,207,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wp43c19pnb3p)" points="207,83,242,83,249,105.2969,289,105.2969,289,187,207,187,207,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="97.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1l7vxyl2f5rbb)" points="193.5,270,288.5,270,295.5,292.2969,302.5,292.2969,302.5,322.5938,193.5,322.5938,193.5,270" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wp43c19pnb3p)" points="193.5,270,288.5,270,295.5,292.2969,302.5,292.2969,302.5,322.5938,193.5,322.5938,193.5,270" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="292.2969" y2="292.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="284.9951">ns2_v1_0_0</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1l7vxyl2f5rbb)" points="38,270,133,270,140,292.2969,158,292.2969,158,322.5938,38,322.5938,38,270" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wp43c19pnb3p)" points="38,270,133,270,140,292.2969,158,292.2969,158,322.5938,38,322.5938,38,270" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="292.2969" y2="292.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="284.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="307.292">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1l7vxyl2f5rbb)" points="223.5,118,258.5,118,265.5,140.2969,272.5,140.2969,272.5,170.5938,223.5,170.5938,223.5,118" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1wp43c19pnb3p)" points="223.5,118,258.5,118,265.5,140.2969,272.5,140.2969,272.5,170.5938,223.5,170.5938,223.5,118" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="140.2969" y2="140.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="132.9951">ns2</text>
     </a>
diff --git a/docs/test_cases/t30003_package_mermaid.svg b/docs/test_cases/t30003_package_mermaid.svg
index 0a3b23e0..de53726e 100644
--- a/docs/test_cases/t30003_package_mermaid.svg
+++ b/docs/test_cases/t30003_package_mermaid.svg
@@ -1,4 +1,4 @@
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-7.5 -8 308.984375 222" style="max-width: 308.984px; background-color: white;" width="308.984375" id="my-svg">
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" aria-roledescription="flowchart-v2" role="graphics-document document" viewBox="-8 -8 340.375 282" style="max-width: 340.375px; background-color: white;" width="340.375" id="my-svg">
   <style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .label{font-family:"trebuchet ms",verdana,arial,sans-serif;color:#333;}#my-svg .cluster-label text{fill:#333;}#my-svg .cluster-label span,#my-svg p{color:#333;}#my-svg .label text,#my-svg span,#my-svg p{fill:#333;color:#333;}#my-svg .node rect,#my-svg .node circle,#my-svg .node ellipse,#my-svg .node polygon,#my-svg .node path{fill:#ECECFF;stroke:#9370DB;stroke-width:1px;}#my-svg .flowchart-label text{text-anchor:middle;}#my-svg .node .label{text-align:center;}#my-svg .node.clickable{cursor:pointer;}#my-svg .arrowheadPath{fill:#333333;}#my-svg .edgePath .path{stroke:#333333;stroke-width:2.0px;}#my-svg .flowchart-link{stroke:#333333;fill:none;}#my-svg .edgeLabel{background-color:#e8e8e8;text-align:center;}#my-svg .edgeLabel rect{opacity:0.5;background-color:#e8e8e8;fill:#e8e8e8;}#my-svg .labelBkg{background-color:rgba(232, 232, 232, 0.5);}#my-svg .cluster rect{fill:#ffffde;stroke:#aaaa33;stroke-width:1px;}#my-svg .cluster text{fill:#333;}#my-svg .cluster span,#my-svg p{color:#333;}#my-svg div.mermaidTooltip{position:absolute;text-align:center;max-width:200px;padding:2px;font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:12px;background:hsl(80, 100%, 96.2745098039%);border:1px solid #aaaa33;border-radius:2px;pointer-events:none;z-index:100;}#my-svg .flowchartTitleText{text-anchor:middle;font-size:18px;fill:#333;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style>
   <g>
     <marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="10" viewBox="0 0 10 10" class="marker flowchart" id="flowchart-pointEnd">
@@ -20,81 +20,84 @@
       <path style="stroke-width: 2; stroke-dasharray: 1, 0;" class="arrowMarkerPath" d="M 1,1 l 9,9 M 10,1 l -9,9"/>
     </marker>
     <g class="root">
-      <g class="clusters"/>
-      <g class="edgePaths"/>
-      <g class="edgeLabels"/>
+      <g class="clusters">
+        <g id="C_0000427104404739526818" class="cluster clickable flowchart-label">
+          <rect height="133" width="150.796875" y="0" x="10.6953125" ry="0" rx="0" style=""/>
+          <g transform="translate(73.1953125, 0)" class="cluster-label">
+            <foreignObject height="18" width="25.796875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">ns3</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0000600452871069546589" class="cluster clickable flowchart-label">
+          <rect height="83" width="324.375" y="183" x="0" ry="0" rx="0" style=""/>
+          <g transform="translate(149.2890625, 183)" class="cluster-label">
+            <foreignObject height="18" width="25.796875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">ns1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g id="C_0001209144861141334061" class="cluster clickable flowchart-label">
+          <rect height="83" width="110.796875" y="25" x="30.6953125" ry="0" rx="0" style=""/>
+          <g transform="translate(73.1953125, 25)" class="cluster-label">
+            <foreignObject height="18" width="25.796875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">ns1</span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
+      <g class="edgePaths">
+        <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M86.09375,83L86.09375,87.16666666666667C86.09375,91.33333333333333,86.09375,99.66666666666667,86.09375,108C86.09375,116.33333333333333,86.09375,124.66666666666667,86.09375,133C86.09375,141.33333333333334,86.09375,149.66666666666666,86.09375,158C86.09375,166.33333333333334,86.09375,174.66666666666666,86.09375,183C86.09375,191.33333333333334,86.09375,199.66666666666666,86.09375,203.83333333333334L86.09375,208"/>
+      </g>
+      <g class="edgeLabels">
+        <g class="edgeLabel">
+          <g transform="translate(0, 0)" class="label">
+            <foreignObject height="0" width="0">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel"/>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+      </g>
       <g class="nodes">
-        <g transform="translate(-7.5, -8)" class="root">
-          <g class="clusters">
-            <g id="C_0000600452871069546589" class="cluster default flowchart-label">
-              <rect height="206" width="292.984375" y="8" x="8" ry="0" rx="0" style=""/>
-              <g transform="translate(141.59375, 8)" class="cluster-label">
-                <foreignObject height="18" width="25.796875">
-                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                    <span class="nodeLabel">ns1</span>
-                  </div>
-                </foreignObject>
-              </g>
-            </g>
-            <g id="C_0000427104404739526818" class="cluster clickable flowchart-label">
-              <rect height="103" width="90.796875" y="28" x="33" ry="0" rx="0" style=""/>
-              <g transform="translate(65.5, 28)" class="cluster-label">
-                <foreignObject height="18" width="25.796875">
-                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                    <span class="nodeLabel">ns3</span>
-                  </div>
-                </foreignObject>
-              </g>
-            </g>
+        <g transform="translate(86.09375, 66.5)" title="ns2" id="flowchart-C_0000820462660523726751-0" class="node default clickable flowchart-label">
+          <rect height="33" width="40.796875" y="-16.5" x="-20.3984375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-12.8984375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="25.796875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">ns2</span>
+              </div>
+            </foreignObject>
           </g>
-          <g class="edgePaths">
-            <path marker-end="url(#flowchart-pointEnd)" style="fill:none;stroke-width:2px;stroke-dasharray:3;" class="edge-thickness-normal edge-pattern-dotted flowchart-link LS-C_0000820462660523726751 LE-C_0000647755950450743637" id="L-C_0000820462660523726751-C_0000647755950450743637-0" d="M98.796875,79.5L102.96354166666667,79.5C107.13020833333333,79.5,115.46354166666667,79.5,123.796875,79.5C132.13020833333334,79.5,140.46354166666666,79.5,148.796875,79.5C157.13020833333334,79.5,165.46354166666666,79.5,169.63020833333334,79.5L173.796875,79.5"/>
+        </g>
+        <g transform="translate(86.09375, 224.5)" title="ns2_v1_0_0" id="flowchart-C_0000647755950450743637-1" class="node default clickable flowchart-label">
+          <rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-43.59375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="87.1875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">ns2_v1_0_0</span>
+              </div>
+            </foreignObject>
           </g>
-          <g class="edgeLabels">
-            <g class="edgeLabel">
-              <g transform="translate(0, 0)" class="label">
-                <foreignObject height="0" width="0">
-                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                    <span class="edgeLabel"/>
-                  </div>
-                </foreignObject>
-              </g>
-            </g>
-          </g>
-          <g class="nodes">
-            <g transform="translate(224.890625, 79.5)" title="ns2_v1_0_0" id="flowchart-C_0000647755950450743637-1" class="node default clickable flowchart-label">
-              <rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/>
-              <g transform="translate(-43.59375, -9)" style="" class="label">
-                <rect/>
-                <foreignObject height="18" width="87.1875">
-                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                    <span class="nodeLabel">ns2_v1_0_0</span>
-                  </div>
-                </foreignObject>
-              </g>
-            </g>
-            <g transform="translate(78.3984375, 79.5)" title="ns2" id="flowchart-C_0000820462660523726751-0" class="node default clickable flowchart-label">
-              <rect height="33" width="40.796875" y="-16.5" x="-20.3984375" ry="0" rx="0" style="" class="basic label-container"/>
-              <g transform="translate(-12.8984375, -9)" style="" class="label">
-                <rect/>
-                <foreignObject height="18" width="25.796875">
-                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                    <span class="nodeLabel">ns2</span>
-                  </div>
-                </foreignObject>
-              </g>
-            </g>
-            <g transform="translate(224.890625, 162.5)" title="ns2_v0_9_0" id="flowchart-C_0001013406647495422406-5" class="node default default flowchart-label">
-              <rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/>
-              <g transform="translate(-43.59375, -9)" style="" class="label">
-                <rect/>
-                <foreignObject height="18" width="87.1875">
-                  <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
-                    <span class="nodeLabel">ns2_v0_9_0</span>
-                  </div>
-                </foreignObject>
-              </g>
-            </g>
+        </g>
+        <g transform="translate(238.28125, 224.5)" title="ns2_v0_9_0" id="flowchart-C_0001013406647495422406-6" class="node default clickable flowchart-label">
+          <rect height="33" width="102.1875" y="-16.5" x="-51.09375" ry="0" rx="0" style="" class="basic label-container"/>
+          <g transform="translate(-43.59375, -9)" style="" class="label">
+            <rect/>
+            <foreignObject height="18" width="87.1875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="nodeLabel">ns2_v0_9_0</span>
+              </div>
+            </foreignObject>
           </g>
         </g>
       </g>
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index d78766a5..e7b9b8c1 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="f6rji0x1yp38d" width="300%" x="-1" y="-1">
+    <filter height="300%" id="frpqmq1wgtr8f" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#008000" filter="url(#f6rji0x1yp38d)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#008000" filter="url(#frpqmq1wgtr8f)" 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(#f6rji0x1yp38d)" 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(#frpqmq1wgtr8f)" 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(#f6rji0x1yp38d)" 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(#frpqmq1wgtr8f)" 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(#f6rji0x1yp38d)" 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(#frpqmq1wgtr8f)" 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(#f6rji0x1yp38d)" 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(#frpqmq1wgtr8f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f6rji0x1yp38d)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#frpqmq1wgtr8f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f6rji0x1yp38d)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#frpqmq1wgtr8f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f6rji0x1yp38d)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#frpqmq1wgtr8f)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <polygon fill="#FFC0CB" filter="url(#f6rji0x1yp38d)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <polygon fill="#FFC0CB" filter="url(#frpqmq1wgtr8f)" 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_package.svg b/docs/test_cases/t30005_package.svg
index 4703a42e..0e9f0237 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="f1nw3dtcti2pow" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4mnbhod1xlau" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1nw3dtcti2pow)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f4mnbhod1xlau)" 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_package.svg b/docs/test_cases/t30006_package.svg
index 196a48e7..d1e557bc 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="fcb052yetdi58" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fkbwlotxqsl0m" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcb052yetdi58)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkbwlotxqsl0m)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcb052yetdi58)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkbwlotxqsl0m)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fcb052yetdi58)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fkbwlotxqsl0m)" 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(#fcb052yetdi58)" 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(#fkbwlotxqsl0m)" 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="GMN1470-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 6137613d..afce72b5 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="fkyh3qhy4mgic" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1537mgaxw0u1g" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fkyh3qhy4mgic)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1537mgaxw0u1g)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fkyh3qhy4mgic)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1537mgaxw0u1g)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fkyh3qhy4mgic)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1537mgaxw0u1g)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fkyh3qhy4mgic)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1537mgaxw0u1g)" 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(#fkyh3qhy4mgic)" 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(#f1537mgaxw0u1g)" 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="GMN1482-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index 008fd71f..19def6ca 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="fz5u4gxin8xbq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f159mx6u9qjvva" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fz5u4gxin8xbq)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f159mx6u9qjvva)" 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_package.svg b/docs/test_cases/t30009_package.svg
index 73bb507c..8a4ad588 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="ffovx0tlw8dhw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flo1b5339eaqg" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#ffovx0tlw8dhw)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#flo1b5339eaqg)" 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/t30010_package.svg b/docs/test_cases/t30010_package.svg
index 4d195056..dc4326a8 100644
--- a/docs/test_cases/t30010_package.svg
+++ b/docs/test_cases/t30010_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="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fb5yduv8vkb3y" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f14unydvap20l8" 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>
-    <polygon fill="#FFFFFF" filter="url(#fb5yduv8vkb3y)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f14unydvap20l8)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fb5yduv8vkb3y)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib1/lib1.h#L7" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib1/lib1.h#L7" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f14unydvap20l8)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fb5yduv8vkb3y)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib2/lib2.h#L7" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib2/lib2.h#L7" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f14unydvap20l8)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fb5yduv8vkb3y)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib3/lib3.h#L7" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib3/lib3.h#L7" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f14unydvap20l8)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fb5yduv8vkb3y)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib4/lib4.h#L7" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/libraries/lib4/lib4.h#L7" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f14unydvap20l8)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fb5yduv8vkb3y)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/app/app.h#L11" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30010/app/app.h#L11" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f14unydvap20l8)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t30011_package.svg b/docs/test_cases/t30011_package.svg
index 083bc07d..48decaf7 100644
--- a/docs/test_cases/t30011_package.svg
+++ b/docs/test_cases/t30011_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="202px" preserveAspectRatio="none" style="width:373px;height:202px;" version="1.1" viewBox="0 0 373 202" width="373px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ie6mus8lorl1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lygppk6f31r7" 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>
-    <polygon fill="#FFFFFF" filter="url(#f1ie6mus8lorl1)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1lygppk6f31r7)" points="22,86,92,86,99,108.2969,351,108.2969,351,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="99" y1="108.2969" y2="108.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="26" y="100.9951">libraries</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1ie6mus8lorl1)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib1/lib1.h#L3" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib1/lib1.h#L3" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1lygppk6f31r7)" points="287,121,321,121,328,143.2969,335,143.2969,335,173.5938,287,173.5938,287,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="287" x2="328" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="291" y="135.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1ie6mus8lorl1)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib2/lib2.h#L3" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib2/lib2.h#L3" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1lygppk6f31r7)" points="204,121,238,121,245,143.2969,252,143.2969,252,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="245" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="208" y="135.9951">lib2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1ie6mus8lorl1)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib3/lib3.h#L3" target="_top" title="lib3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib3/lib3.h#L3" xlink:show="new" xlink:title="lib3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1lygppk6f31r7)" points="121,121,155,121,162,143.2969,169,143.2969,169,173.5938,121,173.5938,121,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="162" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="125" y="135.9951">lib3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1ie6mus8lorl1)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib4/lib4.h#L3" target="_top" title="lib4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/libraries/lib4/lib4.h#L3" xlink:show="new" xlink:title="lib4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1lygppk6f31r7)" points="38,121,72,121,79,143.2969,86,143.2969,86,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="135.9951">lib4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1ie6mus8lorl1)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/app/app.h#L8" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30011/app/app.h#L8" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1lygppk6f31r7)" points="161.5,8,196.5,8,203.5,30.2969,210.5,30.2969,210.5,60.5938,161.5,60.5938,161.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="161.5" x2="203.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="165.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t30012_package.svg b/docs/test_cases/t30012_package.svg
index 3bde79d3..758fbcf5 100644
--- a/docs/test_cases/t30012_package.svg
+++ b/docs/test_cases/t30012_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="207px" preserveAspectRatio="none" style="width:346px;height:207px;" version="1.1" viewBox="0 0 346 207" width="346px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10kd8t8bwj3q7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7mdoxq4hq2e7" 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,26 +9,26 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f10kd8t8bwj3q7)" points="22,24,57,24,64,46.2969,324,46.2969,324,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f7mdoxq4hq2e7)" points="22,24,57,24,64,46.2969,324,46.2969,324,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib1.cppm#L4" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib1.cppm#L4" xlink:show="new" xlink:title="lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kd8t8bwj3q7)" points="105,67,139,67,146,89.2969,300,89.2969,300,171,105,171,105,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib1.cppm#L4" target="_top" title="lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib1.cppm#L4" xlink:show="new" xlink:title="lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f7mdoxq4hq2e7)" points="105,67,139,67,146,89.2969,300,89.2969,300,171,105,171,105,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="146" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="109" y="81.9951">lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kd8t8bwj3q7)" points="220,102,270,102,277,124.2969,284,124.2969,284,154.5938,220,154.5938,220,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f7mdoxq4hq2e7)" points="220,102,270,102,277,124.2969,284,124.2969,284,154.5938,220,154.5938,220,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="220" x2="277" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="224" y="116.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib1mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kd8t8bwj3q7)" points="121,102,171,102,178,124.2969,185,124.2969,185,154.5938,121,154.5938,121,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib1mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib1mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f7mdoxq4hq2e7)" points="121,102,171,102,178,124.2969,185,124.2969,185,154.5938,121,154.5938,121,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="121" x2="178" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="125" y="116.9951">mod2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib2.cppm#L4" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30012/src/lib2.cppm#L4" xlink:show="new" xlink:title="lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f10kd8t8bwj3q7)" points="38,102,72,102,79,124.2969,86,124.2969,86,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib2.cppm#L4" target="_top" title="lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30012/src/lib2.cppm#L4" xlink:show="new" xlink:title="lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f7mdoxq4hq2e7)" points="38,102,72,102,79,124.2969,86,124.2969,86,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="79" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="42" y="116.9951">lib2</text>
     </a>
diff --git a/docs/test_cases/t30013_package.svg b/docs/test_cases/t30013_package.svg
index 0a929f83..3d3f3e54 100644
--- a/docs/test_cases/t30013_package.svg
+++ b/docs/test_cases/t30013_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="185px" preserveAspectRatio="none" style="width:1865px;height:185px;" version="1.1" viewBox="0 0 1865 185" width="1865px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1qu5inyp696v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1cheppdzbw92b" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="6,121,56,121,63,143.2969,70,143.2969,70,173.5938,6,173.5938,6,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="6,121,56,121,63,143.2969,70,143.2969,70,173.5938,6,173.5938,6,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="63" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="10" y="135.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="105,121,155,121,162,143.2969,169,143.2969,169,173.5938,105,173.5938,105,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod2.cppm#L4" target="_top" title="mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod2.cppm#L4" xlink:show="new" xlink:title="mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="105,121,155,121,162,143.2969,169,143.2969,169,173.5938,105,173.5938,105,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="162" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="109" y="135.9951">mod2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod3.cppm#L4" target="_top" title="mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod3.cppm#L4" xlink:show="new" xlink:title="mod3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="204,121,254,121,261,143.2969,268,143.2969,268,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod3.cppm#L4" target="_top" title="mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod3.cppm#L4" xlink:show="new" xlink:title="mod3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="204,121,254,121,261,143.2969,268,143.2969,268,173.5938,204,173.5938,204,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204" x2="261" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="208" y="135.9951">mod3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod4.cppm#L4" target="_top" title="mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod4.cppm#L4" xlink:show="new" xlink:title="mod4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="303,121,353,121,360,143.2969,367,143.2969,367,173.5938,303,173.5938,303,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod4.cppm#L4" target="_top" title="mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod4.cppm#L4" xlink:show="new" xlink:title="mod4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="303,121,353,121,360,143.2969,367,143.2969,367,173.5938,303,173.5938,303,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="303" x2="360" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="307" y="135.9951">mod4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod5.cppm#L4" target="_top" title="mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod5.cppm#L4" xlink:show="new" xlink:title="mod5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="402,121,452,121,459,143.2969,466,143.2969,466,173.5938,402,173.5938,402,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod5.cppm#L4" target="_top" title="mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod5.cppm#L4" xlink:show="new" xlink:title="mod5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="402,121,452,121,459,143.2969,466,143.2969,466,173.5938,402,173.5938,402,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="402" x2="459" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="406" y="135.9951">mod5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod6.cppm#L4" target="_top" title="mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod6.cppm#L4" xlink:show="new" xlink:title="mod6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="501,121,551,121,558,143.2969,565,143.2969,565,173.5938,501,173.5938,501,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod6.cppm#L4" target="_top" title="mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod6.cppm#L4" xlink:show="new" xlink:title="mod6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="501,121,551,121,558,143.2969,565,143.2969,565,173.5938,501,173.5938,501,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="501" x2="558" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="505" y="135.9951">mod6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod7.cppm#L4" target="_top" title="mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod7.cppm#L4" xlink:show="new" xlink:title="mod7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="600,121,650,121,657,143.2969,664,143.2969,664,173.5938,600,173.5938,600,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod7.cppm#L4" target="_top" title="mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod7.cppm#L4" xlink:show="new" xlink:title="mod7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="600,121,650,121,657,143.2969,664,143.2969,664,173.5938,600,173.5938,600,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="600" x2="657" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="604" y="135.9951">mod7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod8.cppm#L4" target="_top" title="mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod8.cppm#L4" xlink:show="new" xlink:title="mod8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="699,121,749,121,756,143.2969,763,143.2969,763,173.5938,699,173.5938,699,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod8.cppm#L4" target="_top" title="mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod8.cppm#L4" xlink:show="new" xlink:title="mod8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="699,121,749,121,756,143.2969,763,143.2969,763,173.5938,699,173.5938,699,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="699" x2="756" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="703" y="135.9951">mod8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod9.cppm#L4" target="_top" title="mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod9.cppm#L4" xlink:show="new" xlink:title="mod9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="798,121,848,121,855,143.2969,862,143.2969,862,173.5938,798,173.5938,798,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod9.cppm#L4" target="_top" title="mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod9.cppm#L4" xlink:show="new" xlink:title="mod9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="798,121,848,121,855,143.2969,862,143.2969,862,173.5938,798,173.5938,798,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="798" x2="855" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="802" y="135.9951">mod9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod10.cppm#L4" target="_top" title="mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod10.cppm#L4" xlink:show="new" xlink:title="mod10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="897,121,957,121,964,143.2969,971,143.2969,971,173.5938,897,173.5938,897,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod10.cppm#L4" target="_top" title="mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod10.cppm#L4" xlink:show="new" xlink:title="mod10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="897,121,957,121,964,143.2969,971,143.2969,971,173.5938,897,173.5938,897,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="897" x2="964" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="901" y="135.9951">mod10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod11.cppm#L4" target="_top" title="mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod11.cppm#L4" xlink:show="new" xlink:title="mod11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1006,121,1066,121,1073,143.2969,1080,143.2969,1080,173.5938,1006,173.5938,1006,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod11.cppm#L4" target="_top" title="mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod11.cppm#L4" xlink:show="new" xlink:title="mod11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1006,121,1066,121,1073,143.2969,1080,143.2969,1080,173.5938,1006,173.5938,1006,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1006" x2="1073" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1010" y="135.9951">mod11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod12.cppm#L4" target="_top" title="mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod12.cppm#L4" xlink:show="new" xlink:title="mod12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1115,121,1175,121,1182,143.2969,1189,143.2969,1189,173.5938,1115,173.5938,1115,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod12.cppm#L4" target="_top" title="mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod12.cppm#L4" xlink:show="new" xlink:title="mod12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1115,121,1175,121,1182,143.2969,1189,143.2969,1189,173.5938,1115,173.5938,1115,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1115" x2="1182" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1119" y="135.9951">mod12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod13.cppm#L4" target="_top" title="mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod13.cppm#L4" xlink:show="new" xlink:title="mod13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1224,121,1284,121,1291,143.2969,1298,143.2969,1298,173.5938,1224,173.5938,1224,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod13.cppm#L4" target="_top" title="mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod13.cppm#L4" xlink:show="new" xlink:title="mod13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1224,121,1284,121,1291,143.2969,1298,143.2969,1298,173.5938,1224,173.5938,1224,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1224" x2="1291" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1228" y="135.9951">mod13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod14.cppm#L4" target="_top" title="mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod14.cppm#L4" xlink:show="new" xlink:title="mod14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1333,121,1393,121,1400,143.2969,1407,143.2969,1407,173.5938,1333,173.5938,1333,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod14.cppm#L4" target="_top" title="mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod14.cppm#L4" xlink:show="new" xlink:title="mod14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1333,121,1393,121,1400,143.2969,1407,143.2969,1407,173.5938,1333,173.5938,1333,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1333" x2="1400" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1337" y="135.9951">mod14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod15.cppm#L4" target="_top" title="mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod15.cppm#L4" xlink:show="new" xlink:title="mod15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1442,121,1502,121,1509,143.2969,1516,143.2969,1516,173.5938,1442,173.5938,1442,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod15.cppm#L4" target="_top" title="mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod15.cppm#L4" xlink:show="new" xlink:title="mod15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1442,121,1502,121,1509,143.2969,1516,143.2969,1516,173.5938,1442,173.5938,1442,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1442" x2="1509" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1446" y="135.9951">mod15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod16.cppm#L4" target="_top" title="mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod16.cppm#L4" xlink:show="new" xlink:title="mod16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1551,121,1611,121,1618,143.2969,1625,143.2969,1625,173.5938,1551,173.5938,1551,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod16.cppm#L4" target="_top" title="mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod16.cppm#L4" xlink:show="new" xlink:title="mod16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1551,121,1611,121,1618,143.2969,1625,143.2969,1625,173.5938,1551,173.5938,1551,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1551" x2="1618" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1555" y="135.9951">mod16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod17.cppm#L4" target="_top" title="mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod17.cppm#L4" xlink:show="new" xlink:title="mod17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1660,121,1720,121,1727,143.2969,1734,143.2969,1734,173.5938,1660,173.5938,1660,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod17.cppm#L4" target="_top" title="mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod17.cppm#L4" xlink:show="new" xlink:title="mod17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1660,121,1720,121,1727,143.2969,1734,143.2969,1734,173.5938,1660,173.5938,1660,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1660" x2="1727" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1664" y="135.9951">mod17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod18.cppm#L4" target="_top" title="mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/mod18.cppm#L4" xlink:show="new" xlink:title="mod18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="1769,121,1829,121,1836,143.2969,1843,143.2969,1843,173.5938,1769,173.5938,1769,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod18.cppm#L4" target="_top" title="mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/mod18.cppm#L4" xlink:show="new" xlink:title="mod18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="1769,121,1829,121,1836,143.2969,1843,143.2969,1843,173.5938,1769,173.5938,1769,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1769" x2="1836" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1773" y="135.9951">mod18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/app.cppm#L32" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30013/src/app.cppm#L32" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qu5inyp696v)" points="857.5,8,892.5,8,899.5,30.2969,906.5,30.2969,906.5,60.5938,857.5,60.5938,857.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/app.cppm#L32" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30013/src/app.cppm#L32" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1cheppdzbw92b)" points="857.5,8,892.5,8,899.5,30.2969,906.5,30.2969,906.5,60.5938,857.5,60.5938,857.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="857.5" x2="899.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="861.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t30014_package.svg b/docs/test_cases/t30014_package.svg
index 7187b30b..54fd26bb 100644
--- a/docs/test_cases/t30014_package.svg
+++ b/docs/test_cases/t30014_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="207px" preserveAspectRatio="none" style="width:253px;height:207px;" version="1.1" viewBox="0 0 253 207" width="253px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1cv8zspwgpotf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1eu3m1mavs4rf" 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,21 +9,21 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1cv8zspwgpotf)" points="22,24,57,24,64,46.2969,231,46.2969,231,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1eu3m1mavs4rf)" points="22,24,57,24,64,46.2969,231,46.2969,231,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="38.9951">app</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30014/src/lib1.cppm#L4" target="_top" title=":lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30014/src/lib1.cppm#L4" xlink:show="new" xlink:title=":lib1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1cv8zspwgpotf)" points="111,67,151,67,158,89.2969,207,89.2969,207,171,111,171,111,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30014/src/lib1.cppm#L4" target="_top" title=":lib1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30014/src/lib1.cppm#L4" xlink:show="new" xlink:title=":lib1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1eu3m1mavs4rf)" points="111,67,151,67,158,89.2969,207,89.2969,207,171,111,171,111,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="111" x2="158" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="115" y="81.9951">:lib1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30014/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30014/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1cv8zspwgpotf)" points="127,102,177,102,184,124.2969,191,124.2969,191,154.5938,127,154.5938,127,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30014/src/lib1mod1.cppm#L4" target="_top" title="mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30014/src/lib1mod1.cppm#L4" xlink:show="new" xlink:title="mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1eu3m1mavs4rf)" points="127,102,177,102,184,124.2969,191,124.2969,191,154.5938,127,154.5938,127,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="127" x2="184" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="44" x="131" y="116.9951">mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30014/src/lib2.cppm#L4" target="_top" title=":lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30014/src/lib2.cppm#L4" xlink:show="new" xlink:title=":lib2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1cv8zspwgpotf)" points="38,102,78,102,85,124.2969,92,124.2969,92,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30014/src/lib2.cppm#L4" target="_top" title=":lib2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30014/src/lib2.cppm#L4" xlink:show="new" xlink:title=":lib2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1eu3m1mavs4rf)" points="38,102,78,102,85,124.2969,92,124.2969,92,154.5938,38,154.5938,38,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="85" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="42" y="116.9951">:lib2</text>
     </a>
diff --git a/docs/test_cases/t30015_package.svg b/docs/test_cases/t30015_package.svg
index af59c171..fecb8b28 100644
--- a/docs/test_cases/t30015_package.svg
+++ b/docs/test_cases/t30015_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="202px" preserveAspectRatio="none" style="width:2021px;height:202px;" version="1.1" viewBox="0 0 2021 202" width="2021px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1q1hjfaizo2u0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fft8reks1cnhq" 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,101 +9,101 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="22,86,56,86,63,108.2969,1999,108.2969,1999,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="22,86,56,86,63,108.2969,1999,108.2969,1999,190,22,190,22,86" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="63" y1="108.2969" y2="108.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="26" y="100.9951">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod1.cppm#L4" target="_top" title=":mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod1.cppm#L4" xlink:show="new" xlink:title=":mod1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1913,121,1969,121,1976,143.2969,1983,143.2969,1983,173.5938,1913,173.5938,1913,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod1.cppm#L4" target="_top" title=":mod1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod1.cppm#L4" xlink:show="new" xlink:title=":mod1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1913,121,1969,121,1976,143.2969,1983,143.2969,1983,173.5938,1913,173.5938,1913,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1913" x2="1976" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1917" y="135.9951">:mod1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod2.cppm#L4" target="_top" title=":mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod2.cppm#L4" xlink:show="new" xlink:title=":mod2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1808,121,1864,121,1871,143.2969,1878,143.2969,1878,173.5938,1808,173.5938,1808,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod2.cppm#L4" target="_top" title=":mod2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod2.cppm#L4" xlink:show="new" xlink:title=":mod2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1808,121,1864,121,1871,143.2969,1878,143.2969,1878,173.5938,1808,173.5938,1808,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1808" x2="1871" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1812" y="135.9951">:mod2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod3.cppm#L4" target="_top" title=":mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod3.cppm#L4" xlink:show="new" xlink:title=":mod3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1703,121,1759,121,1766,143.2969,1773,143.2969,1773,173.5938,1703,173.5938,1703,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod3.cppm#L4" target="_top" title=":mod3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod3.cppm#L4" xlink:show="new" xlink:title=":mod3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1703,121,1759,121,1766,143.2969,1773,143.2969,1773,173.5938,1703,173.5938,1703,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1703" x2="1766" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1707" y="135.9951">:mod3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod4.cppm#L4" target="_top" title=":mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod4.cppm#L4" xlink:show="new" xlink:title=":mod4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1598,121,1654,121,1661,143.2969,1668,143.2969,1668,173.5938,1598,173.5938,1598,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod4.cppm#L4" target="_top" title=":mod4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod4.cppm#L4" xlink:show="new" xlink:title=":mod4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1598,121,1654,121,1661,143.2969,1668,143.2969,1668,173.5938,1598,173.5938,1598,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1598" x2="1661" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1602" y="135.9951">:mod4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod5.cppm#L4" target="_top" title=":mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod5.cppm#L4" xlink:show="new" xlink:title=":mod5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1493,121,1549,121,1556,143.2969,1563,143.2969,1563,173.5938,1493,173.5938,1493,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod5.cppm#L4" target="_top" title=":mod5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod5.cppm#L4" xlink:show="new" xlink:title=":mod5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1493,121,1549,121,1556,143.2969,1563,143.2969,1563,173.5938,1493,173.5938,1493,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1493" x2="1556" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1497" y="135.9951">:mod5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod6.cppm#L4" target="_top" title=":mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod6.cppm#L4" xlink:show="new" xlink:title=":mod6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1388,121,1444,121,1451,143.2969,1458,143.2969,1458,173.5938,1388,173.5938,1388,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod6.cppm#L4" target="_top" title=":mod6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod6.cppm#L4" xlink:show="new" xlink:title=":mod6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1388,121,1444,121,1451,143.2969,1458,143.2969,1458,173.5938,1388,173.5938,1388,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1388" x2="1451" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1392" y="135.9951">:mod6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod7.cppm#L4" target="_top" title=":mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod7.cppm#L4" xlink:show="new" xlink:title=":mod7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1283,121,1339,121,1346,143.2969,1353,143.2969,1353,173.5938,1283,173.5938,1283,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod7.cppm#L4" target="_top" title=":mod7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod7.cppm#L4" xlink:show="new" xlink:title=":mod7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1283,121,1339,121,1346,143.2969,1353,143.2969,1353,173.5938,1283,173.5938,1283,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1283" x2="1346" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1287" y="135.9951">:mod7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod8.cppm#L4" target="_top" title=":mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod8.cppm#L4" xlink:show="new" xlink:title=":mod8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1178,121,1234,121,1241,143.2969,1248,143.2969,1248,173.5938,1178,173.5938,1178,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod8.cppm#L4" target="_top" title=":mod8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod8.cppm#L4" xlink:show="new" xlink:title=":mod8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1178,121,1234,121,1241,143.2969,1248,143.2969,1248,173.5938,1178,173.5938,1178,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1178" x2="1241" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1182" y="135.9951">:mod8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod9.cppm#L4" target="_top" title=":mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod9.cppm#L4" xlink:show="new" xlink:title=":mod9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1073,121,1129,121,1136,143.2969,1143,143.2969,1143,173.5938,1073,173.5938,1073,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod9.cppm#L4" target="_top" title=":mod9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod9.cppm#L4" xlink:show="new" xlink:title=":mod9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1073,121,1129,121,1136,143.2969,1143,143.2969,1143,173.5938,1073,173.5938,1073,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1136" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="50" x="1077" y="135.9951">:mod9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod10.cppm#L4" target="_top" title=":mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod10.cppm#L4" xlink:show="new" xlink:title=":mod10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="958,121,1024,121,1031,143.2969,1038,143.2969,1038,173.5938,958,173.5938,958,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod10.cppm#L4" target="_top" title=":mod10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod10.cppm#L4" xlink:show="new" xlink:title=":mod10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="958,121,1024,121,1031,143.2969,1038,143.2969,1038,173.5938,958,173.5938,958,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="958" x2="1031" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="962" y="135.9951">:mod10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod11.cppm#L4" target="_top" title=":mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod11.cppm#L4" xlink:show="new" xlink:title=":mod11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="843,121,909,121,916,143.2969,923,143.2969,923,173.5938,843,173.5938,843,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod11.cppm#L4" target="_top" title=":mod11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod11.cppm#L4" xlink:show="new" xlink:title=":mod11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="843,121,909,121,916,143.2969,923,143.2969,923,173.5938,843,173.5938,843,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="843" x2="916" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="847" y="135.9951">:mod11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod12.cppm#L4" target="_top" title=":mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod12.cppm#L4" xlink:show="new" xlink:title=":mod12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="728,121,794,121,801,143.2969,808,143.2969,808,173.5938,728,173.5938,728,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod12.cppm#L4" target="_top" title=":mod12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod12.cppm#L4" xlink:show="new" xlink:title=":mod12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="728,121,794,121,801,143.2969,808,143.2969,808,173.5938,728,173.5938,728,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="728" x2="801" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="732" y="135.9951">:mod12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod13.cppm#L4" target="_top" title=":mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod13.cppm#L4" xlink:show="new" xlink:title=":mod13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="613,121,679,121,686,143.2969,693,143.2969,693,173.5938,613,173.5938,613,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod13.cppm#L4" target="_top" title=":mod13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod13.cppm#L4" xlink:show="new" xlink:title=":mod13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="613,121,679,121,686,143.2969,693,143.2969,693,173.5938,613,173.5938,613,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="613" x2="686" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="617" y="135.9951">:mod13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod14.cppm#L4" target="_top" title=":mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod14.cppm#L4" xlink:show="new" xlink:title=":mod14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="498,121,564,121,571,143.2969,578,143.2969,578,173.5938,498,173.5938,498,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod14.cppm#L4" target="_top" title=":mod14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod14.cppm#L4" xlink:show="new" xlink:title=":mod14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="498,121,564,121,571,143.2969,578,143.2969,578,173.5938,498,173.5938,498,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="498" x2="571" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="502" y="135.9951">:mod14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod15.cppm#L4" target="_top" title=":mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod15.cppm#L4" xlink:show="new" xlink:title=":mod15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="383,121,449,121,456,143.2969,463,143.2969,463,173.5938,383,173.5938,383,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod15.cppm#L4" target="_top" title=":mod15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod15.cppm#L4" xlink:show="new" xlink:title=":mod15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="383,121,449,121,456,143.2969,463,143.2969,463,173.5938,383,173.5938,383,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="383" x2="456" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="387" y="135.9951">:mod15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod16.cppm#L4" target="_top" title=":mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod16.cppm#L4" xlink:show="new" xlink:title=":mod16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="268,121,334,121,341,143.2969,348,143.2969,348,173.5938,268,173.5938,268,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod16.cppm#L4" target="_top" title=":mod16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod16.cppm#L4" xlink:show="new" xlink:title=":mod16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="268,121,334,121,341,143.2969,348,143.2969,348,173.5938,268,173.5938,268,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="268" x2="341" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="272" y="135.9951">:mod16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod17.cppm#L4" target="_top" title=":mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod17.cppm#L4" xlink:show="new" xlink:title=":mod17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="153,121,219,121,226,143.2969,233,143.2969,233,173.5938,153,173.5938,153,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod17.cppm#L4" target="_top" title=":mod17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod17.cppm#L4" xlink:show="new" xlink:title=":mod17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="153,121,219,121,226,143.2969,233,143.2969,233,173.5938,153,173.5938,153,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="153" x2="226" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="157" y="135.9951">:mod17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod18.cppm#L4" target="_top" title=":mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/mod18.cppm#L4" xlink:show="new" xlink:title=":mod18" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="38,121,104,121,111,143.2969,118,143.2969,118,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod18.cppm#L4" target="_top" title=":mod18" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/mod18.cppm#L4" xlink:show="new" xlink:title=":mod18" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="38,121,104,121,111,143.2969,118,143.2969,118,173.5938,38,173.5938,38,121" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="111" y1="143.2969" y2="143.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="42" y="135.9951">:mod18</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/app.cppm#L33" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t30015/src/app.cppm#L33" xlink:show="new" xlink:title="app" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1q1hjfaizo2u0)" points="1028.5,8,1063.5,8,1070.5,30.2969,1077.5,30.2969,1077.5,60.5938,1028.5,60.5938,1028.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/app.cppm#L33" target="_top" title="app" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t30015/src/app.cppm#L33" xlink:show="new" xlink:title="app" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fft8reks1cnhq)" points="1028.5,8,1063.5,8,1070.5,30.2969,1077.5,30.2969,1077.5,60.5938,1028.5,60.5938,1028.5,8" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1028.5" x2="1070.5" y1="30.2969" y2="30.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="1032.5" y="22.9951">app</text>
     </a>
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index d2d85209..f0097a3a 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="397px" preserveAspectRatio="none" style="width:676px;height:397px;" version="1.1" viewBox="0 0 676 397" width="676px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgviwe5nlkwzd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="feg6tdci8x8fp" 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"/>
@@ -10,41 +10,41 @@
   </defs>
   <g>
     <text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacingAndGlyphs" textLength="273" x="204.5" y="16.708">Basic include diagram example</text>
-    <polygon fill="#FFFFFF" filter="url(#fgviwe5nlkwzd)" points="187,44.9531,218,44.9531,225,67.25,309,67.25,309,131.9531,187,131.9531,187,44.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#feg6tdci8x8fp)" points="187,44.9531,218,44.9531,225,67.25,309,67.25,309,131.9531,187,131.9531,187,44.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="67.25" y2="67.25"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="59.9482">src</text>
-    <polygon fill="#FFFFFF" filter="url(#fgviwe5nlkwzd)" points="22,155.9531,85,155.9531,92,178.25,211,178.25,211,385.9531,22,385.9531,22,155.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#feg6tdci8x8fp)" points="22,155.9531,85,155.9531,92,178.25,211,178.25,211,385.9531,22,385.9531,22,155.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="178.25" y2="178.25"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="170.9482">include</text>
-    <polygon fill="#FFFFFF" filter="url(#fgviwe5nlkwzd)" points="54,250.9531,88,250.9531,95,273.25,179,273.25,179,353.9531,54,353.9531,54,250.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#feg6tdci8x8fp)" points="54,250.9531,88,250.9531,95,273.25,179,273.25,179,353.9531,54,353.9531,54,250.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="273.25" y2="273.25"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="265.9482">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fgviwe5nlkwzd)" points="203,79.9531,203,116.25,293,116.25,293,89.9531,283,79.9531,203,79.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#feg6tdci8x8fp)" points="203,79.9531,203,116.25,293,116.25,293,89.9531,283,79.9531,203,79.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M283,79.9531 L283,89.9531 L293,89.9531 " 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="102.9482">t40001.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fgviwe5nlkwzd)" points="46.5,190.9531,46.5,227.25,195.5,227.25,195.5,200.9531,185.5,190.9531,46.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#feg6tdci8x8fp)" points="46.5,190.9531,46.5,227.25,195.5,227.25,195.5,200.9531,185.5,190.9531,46.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M185.5,190.9531 L185.5,200.9531 L195.5,200.9531 " 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="213.9482">t40001_include1.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#fgviwe5nlkwzd)" points="97.5,293.9531,97.5,330.25,154.5,330.25,154.5,303.9531,144.5,293.9531,97.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#feg6tdci8x8fp)" points="97.5,293.9531,97.5,330.25,154.5,330.25,154.5,303.9531,144.5,293.9531,97.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M144.5,293.9531 L144.5,303.9531 L154.5,303.9531 " 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="316.9482">lib1.h</text>
-    <polygon fill="#FEFECE" filter="url(#fgviwe5nlkwzd)" points="393.5,293.9531,393.5,330.25,452.5,330.25,452.5,303.9531,442.5,293.9531,393.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#feg6tdci8x8fp)" points="393.5,293.9531,393.5,330.25,452.5,330.25,452.5,303.9531,442.5,293.9531,393.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M442.5,293.9531 L442.5,303.9531 L452.5,303.9531 " 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="316.9482">string</text>
-    <polygon fill="#FEFECE" filter="url(#fgviwe5nlkwzd)" points="301.5,190.9531,301.5,227.25,364.5,227.25,364.5,200.9531,354.5,190.9531,301.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#feg6tdci8x8fp)" points="301.5,190.9531,301.5,227.25,364.5,227.25,364.5,200.9531,354.5,190.9531,301.5,190.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M354.5,190.9531 L354.5,200.9531 L364.5,200.9531 " 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="213.9482">vector</text>
-    <polygon fill="#FEFECE" filter="url(#fgviwe5nlkwzd)" points="227.5,293.9531,227.5,330.25,358.5,330.25,358.5,303.9531,348.5,293.9531,227.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#feg6tdci8x8fp)" points="227.5,293.9531,227.5,330.25,358.5,330.25,358.5,303.9531,348.5,293.9531,227.5,293.9531" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M348.5,293.9531 L348.5,303.9531 L358.5,303.9531 " 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="316.9482">yaml-cpp/yaml.h</text>
-    <path d="M487.5,299.4531 L487.5,324.5859 L654.5,324.5859 L654.5,309.4531 L644.5,299.4531 L487.5,299.4531 " fill="#FBFB77" filter="url(#fgviwe5nlkwzd)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M487.5,299.4531 L487.5,324.5859 L654.5,324.5859 L654.5,309.4531 L644.5,299.4531 L487.5,299.4531 " fill="#FBFB77" filter="url(#feg6tdci8x8fp)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M644.5,299.4531 L644.5,309.4531 L654.5,309.4531 L644.5,299.4531 " 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="316.52">This is a lib1 include dir</text>
-    <path d="M400,196.4531 L400,221.5859 L664,221.5859 L664,206.4531 L654,196.4531 L400,196.4531 " fill="#FBFB77" filter="url(#fgviwe5nlkwzd)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M400,196.4531 L400,221.5859 L664,221.5859 L664,206.4531 L654,196.4531 L400,196.4531 " fill="#FBFB77" filter="url(#feg6tdci8x8fp)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M654,196.4531 L654,206.4531 L664,206.4531 L654,196.4531 " 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="213.52">This is a t40001_include1.h include file</text>
     <path d="M247.19,116.2831 C246.91,144.4031 250.93,199.5631 284,226.9531 C299.81,240.0431 358.52,224.1931 376,234.9531 C395.8,247.1431 408.53,271.1231 415.68,288.8931 " 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/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg
index be8bfda8..dcdbada3 100644
--- a/docs/test_cases/t40001_include_mermaid.svg
+++ b/docs/test_cases/t40001_include_mermaid.svg
@@ -138,7 +138,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40001/include/t40001_include1.h#L0">
+        <a transform="translate(504.03515625, 174.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40001/include/t40001_include1.h#L0">
           <g title="t40001_include1.h" id="flowchart-C_0001926692816440595520-3" class="node default clickable flowchart-label">
             <rect height="33" width="145.78125" y="-16.5" x="-72.890625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-65.390625, -9)" style="" class="label">
@@ -151,7 +151,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L0">
+        <a transform="translate(412.41015625, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -164,7 +164,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40001/src/t40001.cc#L0">
+        <a transform="translate(589.01171875, 41.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40001/src/t40001.cc#L0">
           <g title="t40001.cc" id="flowchart-C_0001755015016680017839-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index db32864a..b0420a30 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="fzhlkth78xf1k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4ywz1wn1a4m6" 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(#fzhlkth78xf1k)" 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(#f4ywz1wn1a4m6)" 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(#fzhlkth78xf1k)" 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(#f4ywz1wn1a4m6)" 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(#fzhlkth78xf1k)" 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(#f4ywz1wn1a4m6)" 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(#fzhlkth78xf1k)" 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(#f4ywz1wn1a4m6)" 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(#fzhlkth78xf1k)" 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(#f4ywz1wn1a4m6)" 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(#fzhlkth78xf1k)" 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(#f4ywz1wn1a4m6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fzhlkth78xf1k)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f4ywz1wn1a4m6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fzhlkth78xf1k)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f4ywz1wn1a4m6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fzhlkth78xf1k)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f4ywz1wn1a4m6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fzhlkth78xf1k)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f4ywz1wn1a4m6)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fzhlkth78xf1k)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f4ywz1wn1a4m6)" 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/t40002_include_mermaid.svg b/docs/test_cases/t40002_include_mermaid.svg
index 71c3ddaa..bd4c0829 100644
--- a/docs/test_cases/t40002_include_mermaid.svg
+++ b/docs/test_cases/t40002_include_mermaid.svg
@@ -137,7 +137,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/include/lib2/lib2.h#L0">
+        <a transform="translate(210.59765625, 382.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/include/lib2/lib2.h#L0">
           <g title="lib2.h" id="flowchart-C_0001969674835696841438-4" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -150,7 +150,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/include/lib1/lib1.h#L0">
+        <a transform="translate(212.8125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/include/lib1/lib1.h#L0">
           <g title="lib1.h" id="flowchart-C_0002193549214042244690-3" class="node default clickable flowchart-label">
             <rect height="33" width="53.25" y="-16.5" x="-26.625" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-19.125, -9)" style="" class="label">
@@ -163,7 +163,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/t40002.cc#L0">
+        <a transform="translate(100.8125, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/t40002.cc#L0">
           <g title="t40002.cc" id="flowchart-C_0001489450289909741706-0" class="node default clickable flowchart-label">
             <rect height="33" width="84.390625" y="-16.5" x="-42.1953125" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-34.6953125, -9)" style="" class="label">
@@ -176,7 +176,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/lib2/lib2.cc#L0">
+        <a transform="translate(403.546875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/lib2/lib2.cc#L0">
           <g title="lib2.cc" id="flowchart-C_0001761875020766116446-2" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
@@ -189,7 +189,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40002/src/lib1/lib1.cc#L0">
+        <a transform="translate(253.1875, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40002/src/lib1/lib1.cc#L0">
           <g title="lib1.cc" id="flowchart-C_0001493913207373215402-1" class="node default clickable flowchart-label">
             <rect height="33" width="60.359375" y="-16.5" x="-30.1796875" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-22.6796875, -9)" style="" class="label">
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index e365250e..18c14959 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="f6etlox5bfy65" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbffe2s2fv58j" 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,62 +9,62 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f6etlox5bfy65)" 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(#fbffe2s2fv58j)" 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(#f6etlox5bfy65)" 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(#fbffe2s2fv58j)" 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(#f6etlox5bfy65)" 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(#fbffe2s2fv58j)" 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(#f6etlox5bfy65)" 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(#fbffe2s2fv58j)" 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(#f6etlox5bfy65)" 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(#fbffe2s2fv58j)" 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(#f6etlox5bfy65)" 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(#fbffe2s2fv58j)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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>
-    <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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;"/>
+    <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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 href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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>
-    <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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;"/>
+    <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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 href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f6etlox5bfy65)" 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/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fbffe2s2fv58j)" 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/t40003_include_mermaid.svg b/docs/test_cases/t40003_include_mermaid.svg
index d0b53bb6..64880eee 100644
--- a/docs/test_cases/t40003_include_mermaid.svg
+++ b/docs/test_cases/t40003_include_mermaid.svg
@@ -167,7 +167,7 @@
         </g>
       </g>
       <g class="nodes">
-        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t3.h#L0">
+        <a transform="translate(214.640625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0001226843223635488673-5" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -180,7 +180,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t2.h#L0">
+        <a transform="translate(214.640625, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001849348825646635129-6" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -193,7 +193,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L0">
+        <a transform="translate(260.484375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L0">
           <g title="t1.h" id="flowchart-C_0001120257488305564427-7" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -206,7 +206,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependencies/t5.h#L0">
+        <a transform="translate(306.328125, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependencies/t5.h#L0">
           <g title="t5.h" id="flowchart-C_0002106129159239499468-8" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -219,7 +219,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependants/t3.h#L0">
+        <a transform="translate(79.3984375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependants/t3.h#L0">
           <g title="t3.h" id="flowchart-C_0000060001020671836182-2" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -232,7 +232,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/include/dependants/t2.h#L0">
+        <a transform="translate(79.3984375, 332.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/include/dependants/t2.h#L0">
           <g title="t2.h" id="flowchart-C_0001921842892192045013-3" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -245,7 +245,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/#L0">
+        <a transform="translate(79.3984375, 415.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/#L0">
           <g title="t1.h" id="flowchart-C_0002295271780650013565-4" class="node default clickable flowchart-label">
             <rect height="33" width="41.6875" y="-16.5" x="-20.84375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-13.34375, -9)" style="" class="label">
@@ -258,7 +258,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/src/dependencies/t2.cc#L0">
+        <a transform="translate(260.484375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/src/dependencies/t2.cc#L0">
           <g title="t2.cc" id="flowchart-C_0002215849176605856058-1" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">
@@ -271,7 +271,7 @@
             </g>
           </g>
         </a>
-        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/7fcd0dc0ddf47cf95d771d246b3fec780ea144c7/tests/t40003/src/dependants/t1.cc#L0">
+        <a transform="translate(79.3984375, 66.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/a7e2f7a4964a73795072df456d8828296809dbe4/tests/t40003/src/dependants/t1.cc#L0">
           <g title="t1.cc" id="flowchart-C_0001215324434184692437-0" class="node default clickable flowchart-label">
             <rect height="33" width="48.796875" y="-16.5" x="-24.3984375" ry="0" rx="0" style="" class="basic label-container"/>
             <g transform="translate(-16.8984375, -9)" style="" class="label">