Added Makefile option to build with address sanitizer

Added CLANG_UML_ENABLE_BACKTRACE CMake option to enable backtrace in release builds (#292 )
Merge pull request #291 from bkryza/v0.5.3
2024-07-12 16:58:13 +02:00 · 2024-06-21 23:52:33 +02:00 · 2024-06-19 21:58:11 +02:00 · 2024-06-19 18:26:38 +02:00 · 2024-06-19 18:23:15 +02:00 · 2024-06-19 17:56:40 +02:00
751 changed files with 44664 additions and 46169 deletions
--- 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
--- a/.clang-uml
+++ b/.clang-uml
@@ -4,6 +4,7 @@ comment_parser: clang
 add_compile_flags:
  - -fparse-all-comments
  - -Wno-deprecated-declarations
+  - -Wno-ignored-optimization-argument
 remove_compile_flags:
  - -Wno-class-memaccess
  - -Wno-dangling-reference
--- a/.envrc
+++ b/.envrc
@@ -0,0 +1 @@
+use flake .
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
    - name: Update package database
      run: sudo apt -y update
    - name: Install deps
@@ -41,15 +41,18 @@ jobs:
        make check-formatting
    - name: Build and unit test
      run: |
-        NUMPROC=2 CMAKE_CXX_FLAGS="--coverage -fno-inline" CMAKE_EXE_LINKER_FLAGS="-lgcov --coverage" LLVM_VERSION=15 make test
+        NUMPROC=2 CODE_COVERAGE=ON LLVM_VERSION=15 make test
    - name: Run coverage
      run: |
        lcov -c -d debug -o coverage.info
-        lcov -e coverage.info "$PWD/src/*" -o coverage-src.info
+        lcov -r coverage.info -o coverage-src.info "$PWD/src/main.cc" "$PWD/src/common/generators/generators.cc"
+        lcov -e coverage-src.info -o coverage-src.info "$PWD/src/*"
        lcov -l coverage-src.info
    - name: Upload coverage
      uses: codecov/codecov-action@v3
      with:
        files: coverage-src.info
+        disable_search: true
        name: clang-uml
-        fail_ci_if_error: true
+        token: ${{ secrets.CODECOV_TOKEN }}
+        fail_ci_if_error: false
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,10 @@ coverage*.info
 packaging/_BUILD
 packaging/conda/meta.yaml

+#nix
+.direnv/
+result
+
 # CLion

 .idea/
--- a/.sanitize-blacklist
+++ b/.sanitize-blacklist
@@ -0,0 +1 @@
+fun:*SmallVector*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,30 @@
 # CHANGELOG

-### 0.5.1
+### 0.5.3
+ * Added context filter direction and relationships options (#274)
+ * Improved test coverage (#287)
+ * Fixed handling of relationships to nested enums (#280)
+ * Improved handling of anonymous and multi-dimensions arrays in
+   class diagrams (#278)
+ * Fixed handling of enums in class diagram context filter (#275)
+ * Added Nix clang wrapper for improved include paths handling (Thanks
+   @pogobanane)
+ * Refactored test cases (#272) 

+### 0.5.2
+ * Fixed generation of empty packages in class diagrams (#253)
+ * Added option inline_lambda_messages to omit lambda expressions from sequence
+   diagrams (#261)
+ * Added support for CUDA calls in sequence diagrams (#263)
+ * Improved handling of message call comments (#264)
+ * Fixed handling of nested lambda expressions in sequence diagrams
+ * Fixed type aliases handling in sequence diagram message names (#260)
+ * Added support for call expressions tracking through lambdas in function
+   arguments (#168)
+ * Added Nix build files (Thanks @hatch01, @uku3lig, @thomaslepoix)
+ * Fixed building with LLVM 18 (#251)
+
+### 0.5.1
 * Fixed elements filter in sequence diagrams (#248)
 * Fixed progress indicators ranges with multiple commands per TU (#240)
 * Added default diagram generation error for empty diagrams (#246)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.16)
 #
 project(clang-uml C CXX)

+cmake_policy(SET CMP0054 NEW)
+
 #
 # CMake standard defines
 #
@@ -59,6 +61,32 @@ setup_git_version()
 message(STATUS "clang-uml version: "
               "${GIT_VERSION_MAJOR}.${GIT_VERSION_MINOR}.${GIT_VERSION_PATCH}")

+#
+# Setup coverage
+#
+option(CODE_COVERAGE "" OFF)
+if(CODE_COVERAGE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fno-inline")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov --coverage")
+endif(CODE_COVERAGE)
+
+#
+# Setup Address Sanitizer
+#
+option(ADDRESS_SANITIZER "" OFF)
+if(ADDRESS_SANITIZER)
+    set(CMAKE_CXX_FLAGS
+            "${CMAKE_CXX_FLAGS} \
+            -fno-omit-frame-pointer \
+            -fsanitize=address \
+            -fsanitize-blacklist=${CMAKE_CURRENT_SOURCE_DIR}/.sanitize-blacklist")
+    set(CMAKE_EXE_LINKER_FLAGS
+            "${CMAKE_EXE_LINKER_FLAGS} \
+            -fno-omit-frame-pointer \
+            -fsanitize=address \
+            -fsanitize-blacklist=${CMAKE_CURRENT_SOURCE_DIR}/.sanitize-blacklist")
+endif(ADDRESS_SANITIZER)
+
 #
 # Setup LLVM
 #
@@ -107,6 +135,7 @@ if(APPLE)
        set(YAML_CPP_LIBRARY_DIR ${HOMEBREW_PREFIX}/lib)
    endif(PKG_CONFIG_FOUND)
 elseif(MSVC)
+    find_package(yaml-cpp REQUIRED)
    set(YAML_CPP_LIBRARIES "yaml-cpp")
 else()
    find_package(yaml-cpp REQUIRED)
@@ -121,14 +150,25 @@ endif()
 link_directories(${LLVM_LIBRARY_DIR} ${YAML_CPP_LIBRARY_DIR})

 #
-# Setup libdw and libunwind
+# Setup backward-cpp, libdw and libunwind
 #
-if(LINUX AND (CMAKE_BUILD_TYPE MATCHES Debug))
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(CLANG_UML_ENABLE_BACKTRACE_DEFAULT ON)
+else()
+    set(CLANG_UML_ENABLE_BACKTRACE_DEFAULT OFF)
+endif()
+option(CLANG_UML_ENABLE_BACKTRACE "Enable backtrace on segfault"
+        ${CLANG_UML_ENABLE_BACKTRACE_DEFAULT})
+
+if(LINUX AND CLANG_UML_ENABLE_BACKTRACE)
    find_package(PkgConfig REQUIRED)
    pkg_check_modules(DW REQUIRED IMPORTED_TARGET libdw)
    pkg_check_modules(UNWIND REQUIRED IMPORTED_TARGET libunwind)
    set(BACKWARD_CPP_LIBRARIES PkgConfig::DW PkgConfig::UNWIND)
    set(ENABLE_BACKWARD_CPP -DENABLE_BACKWARD_CPP)
+    message(STATUS "Enabling backward-cpp")
+else()
+    message(STATUS "Disabling backward-cpp")
 endif()

 #
@@ -154,7 +194,17 @@ add_subdirectory(src)
 #
 option(BUILD_TESTS "" ON)
 option(ENABLE_CXX_MODULES_TEST_CASES "" OFF)
+option(ENABLE_CUDA_TEST_CASES "" OFF)
+
+#
+# Setup CUDA if available
+#
+if(ENABLE_CUDA_TEST_CASES)
+    include(CheckLanguage)
+    check_language(CUDA)
+endif(ENABLE_CUDA_TEST_CASES)
+
 if(BUILD_TESTS)
-  enable_testing()
-  add_subdirectory(tests)
+    enable_testing()
+    add_subdirectory(tests)
 endif(BUILD_TESTS)
--- a/2
+++ b/2
@@ -38,7 +38,7 @@ PROJECT_NAME           = "clang-uml"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 0.5.1
+PROJECT_NUMBER         = 0.5.3

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/28
+++ b/28
@@ -37,8 +37,11 @@ CMAKE_PREFIX ?=
 CMAKE_CXX_FLAGS ?=
 CMAKE_EXE_LINKER_FLAGS ?=
 CMAKE_GENERATOR ?= Unix Makefiles
+CODE_COVERAGE ?= OFF
+ADDRESS_SANITIZER ?= OFF

 ENABLE_CXX_MODULES_TEST_CASES ?= OFF
+ENABLE_CUDA_TEST_CASES ?= OFF

 GIT_VERSION	?= $(shell git describe --tags --always --abbrev=7)
 PKG_VERSION	?= $(shell git describe --tags --always --abbrev=7 | tr - .)
@@ -49,9 +52,10 @@ DESTDIR ?=

 .PHONY: clean
 clean:
-	rm -rf debug release debug_tidy
+	rm -rf debug release debug_tidy coverage.info coverage-src.info

 debug/CMakeLists.txt:
+	$(eval CLANG_UML_ENABLE_BACKTRACE ?= ON)
 	cmake -S . -B debug \
 		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
@@ -63,9 +67,14 @@ debug/CMakeLists.txt:
 		-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
 		-DLINK_LLVM_SHARED=${LLVM_SHARED} \
 		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
-		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES)
+		-DENABLE_CUDA_TEST_CASES=$(ENABLE_CUDA_TEST_CASES) \
+		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES) \
+		-DCODE_COVERAGE=$(CODE_COVERAGE) \
+		-DADDRESS_SANITIZER=$(ADDRESS_SANITIZER) \
+		-DCLANG_UML_ENABLE_BACKTRACE=$(CLANG_UML_ENABLE_BACKTRACE)

 release/CMakeLists.txt:
+	$(eval CLANG_UML_ENABLE_BACKTRACE ?= OFF)
 	cmake -S . -B release \
 		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
@@ -77,7 +86,10 @@ release/CMakeLists.txt:
 		-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
 		-DLINK_LLVM_SHARED=${LLVM_SHARED} \
 		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
-		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES)
+		-DADDRESS_SANITIZER=$(ADDRESS_SANITIZER) \
+		-DENABLE_CUDA_TEST_CASES=$(ENABLE_CUDA_TEST_CASES) \
+		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES) \
+		-DCLANG_UML_ENABLE_BACKTRACE=$(CLANG_UML_ENABLE_BACKTRACE)

 debug_tidy/CMakeLists.txt:
 	cmake -S . -B debug_tidy \
@@ -92,6 +104,7 @@ debug_tidy/CMakeLists.txt:
 		-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH} \
 		-DLINK_LLVM_SHARED=${LLVM_SHARED} \
 		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
+		-DENABLE_CUDA_TEST_CASES=$(ENABLE_CUDA_TEST_CASES) \
 		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES)

 debug: debug/CMakeLists.txt
@@ -111,6 +124,13 @@ test: debug
 test_release: release
 	CTEST_OUTPUT_ON_FAILURE=1 ctest --test-dir release

+coverage_report: test
+	lcov -c -d debug -o coverage.info
+	lcov -r coverage.info -o coverage-src.info "${PWD}/src/main.cc" "${PWD}/src/common/generators/generators.cc"
+	lcov -e coverage-src.info -o coverage-src.info "${PWD}/src/*"
+	lcov -l coverage-src.info
+	genhtml coverage-src.info --output-directory debug/coverage_html
+
 install: release
 	make -C release install DESTDIR=${DESTDIR}

@@ -159,7 +179,7 @@ format:

 .PHONY: debug_tidy
 tidy: debug_tidy
-	run-clang-tidy-15 -extra-arg=-Wno-unknown-warning-option -j $(NUMPROC) -p debug_tidy ./src
+	run-clang-tidy-17 -extra-arg=-Wno-unknown-warning-option -j $(NUMPROC) -p debug_tidy ./src

 .PHONY: check-formatting
 check-formatting:
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@

 [![Build status](https://github.com/bkryza/clang-uml/actions/workflows/build.yml/badge.svg)](https://github.com/bkryza/clang-uml/actions)
 [![Coverage](https://codecov.io/gh/bkryza/clang-uml/branch/master/graph/badge.svg)](https://codecov.io/gh/bkryza/clang-uml)
-[![Version](https://img.shields.io/badge/version-0.5.1-blue)](https://github.com/bkryza/clang-uml/releases)
-[![Version](https://img.shields.io/badge/LLVM-12,13,14,15,16,17-orange)](https://github.com/bkryza/clang-uml/releases)
+[![Version](https://img.shields.io/badge/version-0.5.3-blue)](https://github.com/bkryza/clang-uml/releases)
+[![Version](https://img.shields.io/badge/LLVM-12,13,14,15,16,17,18-orange)](https://github.com/bkryza/clang-uml/releases)
 [![Doxygen](https://img.shields.io/badge/Docs-Doxygen-gainsboro)](https://clang-uml.github.io)

 `clang-uml` is an automatic C++ to UML class, sequence, package and include diagram generator, driven by
@@ -52,6 +52,7 @@ Main features supported so far include:
    * Handling of template code including constexpr conditionals - [_example_](docs/test_cases/t20018.md)
    * Handling of lambda expressions - [_example_](docs/test_cases/t20012.md)
    * Interactive links to online code to classes and call expressions - [_example_](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t20021_sequence.svg)
+    * Support for CUDA Kernel and CUDA Device function calls - [_example_](docs/test_cases/t20050.md)
 * **Package diagram generation**
    * Generation of package diagram based on C++ namespaces - [_example_](docs/test_cases/t30001.md)
    * Generation of package diagram based on subdirectories - [_example_](docs/test_cases/t30010.md)
@@ -446,7 +447,7 @@ This project relies on the following great tools:
 * [Clang LibTooling](https://clang.llvm.org/docs/LibTooling.html) - a C++ library for creating tools based on Clang
 * [PlantUML](https://plantuml.com/) - language and diagram for generating UML diagrams
 * [MermaidJS](https://mermaid.js.org/) - JavaScript based diagramming and charting tool
-* [Catch2](https://github.com/catchorg/Catch2) - C++ unit test framework
+* [doctest](https://github.com/doctest/doctest) - C++ unit test framework
 * [glob](https://github.com/p-ranav/glob) - Unix style path expansion for C++
 * [indicators](https://github.com/p-ranav/indicators) - Activity indicators for modern C++
 * [CLI11](https://github.com/CLIUtils/CLI11) - command line parser for C++
--- a/cmake/LLVMSetup.cmake
+++ b/cmake/LLVMSetup.cmake
@@ -22,6 +22,10 @@ if(NOT "${LLVM_CONFIG_PATH}" STREQUAL "")
    set(LLVM_VERSION ${CMAKE_MATCH_1})
 endif()

+if(LLVM_VERSION STREQUAL "18")
+    set(LLVM_VERSION "18.1")
+endif()
+
 find_package(LLVM ${LLVM_VERSION} CONFIG REQUIRED)

 list(APPEND CMAKE_MODULE_PATH ${LLVM_CMAKE_DIR})
@@ -77,6 +81,11 @@ else(LINK_LLVM_SHARED)
    if(${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "16.0")
        list(APPEND LIBTOOLING_LIBS clangASTMatchers)
    endif()
+    if(MSVC)
+        if(${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "18.1")
+            list(APPEND LIBTOOLING_LIBS clangAPINotes)
+        endif()
+    endif(MSVC)
 endif(LINK_LLVM_SHARED)

 if("${LIBTOOLING_LIBS}" STREQUAL "")
--- a/docs/common_options.md
+++ b/docs/common_options.md
@@ -11,6 +11,7 @@
  * [Use '--query-driver' command line option](#use---query-driver-command-line-option)
  * [Manually add and remove compile flags from the compilation database](#manually-add-and-remove-compile-flags-from-the-compilation-database)
  * [Using 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES'](#using-cmake_cxx_implicit_include_directories)
+  * [Nix wrapper](#nix-wrapper)

 <!-- tocstop -->

@@ -224,4 +225,11 @@ Yet another option, for CMake based projects, is to use the following CMake opti
 set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
 ```

+### Nix wrapper
+On NixOS or when using `nix`, `clang-uml` uses a wrapper script,
+which builds and exports `CPATH` and `CPLUS_INCLUDE_PATH`
+environment variables before running `clang-uml`, which contain valid
+system header Clang paths for the current Nix environment.

+If you want to use an unwrapped version, the `clang-uml-unwrapped` binary
+can be called the same way as `clang-uml`.
--- a/docs/diagram_filters.md
+++ b/docs/diagram_filters.md
@@ -8,6 +8,9 @@
 * [element_types](#element_types)
 * [paths](#paths)
 * [context](#context)
+  * [context radius](#context-radius)
+  * [context direction](#context-direction)
+  * [context relationships](#context-relationships)
 * [relationships](#relationships)
 * [subclasses](#subclasses)
 * [parents](#parents)
@@ -152,7 +155,8 @@ paths to directories can be specified.
 ## context

 This filter allows to limit the diagram elements only to classes which are in
-direct relationship (of any kind) with the specified class, enum or concept:
+direct relationship (of any kind) with the specified `class`, `enum` or
+`concept`:

 ```yaml
  include:
@@ -160,6 +164,7 @@ direct relationship (of any kind) with the specified class, enum or concept:
      - ns1::ns2::MyClass
 ```

+### context radius
 By default, the filter will only include or exclude items in direct
 relationship (radius 1). It is however possible to define the context filter
 and provide a custom radius:
@@ -178,6 +183,46 @@ and provide a custom radius:
 Please note that you can specify multiple context filters in a single diagram
 with different radius. Radius set to 0 will match only the given element.

+### context direction
+Sometimes we may be interested only in relationships pointing outward from
+a specific element, or inward. For instance we may want to see which elements
+depend through any relationship on a specified element. For this purpose the
+context filter has a `direction` option, which can have one of 3 values:
+  * `any` (default)
+  * `inward` - only relationships pointing toward the specified class are
+               considered in calculating the context
+  * `outward` -  only relationships pointing toward the specified class are
+               considered in calculating the context
+
+For example, the following filter:
+```yaml
+      context:
+        - match:
+            radius: 2
+            pattern: clanguml::t00076::B
+            direction: inward
+```
+will include all elements related to class `B` through relationships pointing
+toward `B` within a radius of maximum 2 relationships (see test case
+[t00076](./test_cases/t00076.md)).
+
+### context relationships
+Another way to customize the context of a specified element is to declare
+which relationships should be considered when calculating the elements' context.
+
+For example, the following filter:
+```yaml
+      context:
+        - match:
+            radius: 1
+            pattern: clanguml::t00078::A
+            relationships:
+              - inheritance
+              - aggregation
+```
+will only include elements related to class `A` through inheritance or
+aggregation relationship (see test case [t00076](./test_cases/t00078.md)).
+
 ## relationships

 This filter allows to include or exclude specific types of relationships from the diagram, for instance to only
@@ -258,6 +303,8 @@ The following callee types are supported:
  * `function`
  * `function_template`
  * `lambda`
+  * `cuda_kernel`
+  * `cuda_device`

 ## dependants and dependencies

--- a/docs/installation.md
+++ b/docs/installation.md
@@ -6,6 +6,7 @@
  * [Ubuntu](#ubuntu)
  * [Fedora](#fedora)
  * [Conda](#conda)
+  * [Nix](#nix)
  * [Windows](#windows)
 * [Building from source](#building-from-source)
  * [Linux](#linux)
@@ -32,17 +33,17 @@ sudo apt install clang-uml
 #### Fedora

 ```bash
-# Fedora 37
-wget https://github.com/bkryza/clang-uml/releases/download/0.5.1/clang-uml-0.5.1-1.fc37.x86_64.rpm
-sudo dnf install ./clang-uml-0.5.1-1.fc37.x86_64.rpm
-
 # Fedora 38
-wget https://github.com/bkryza/clang-uml/releases/download/0.5.1/clang-uml-0.5.1-1.fc38.x86_64.rpm
-sudo dnf install ./clang-uml-0.5.1-1.fc38.x86_64.rpm
+wget https://github.com/bkryza/clang-uml/releases/download/0.5.3/clang-uml-0.5.3-1.fc38.x86_64.rpm
+sudo dnf install ./clang-uml-0.5.3-1.fc38.x86_64.rpm

 # Fedora 39
-wget https://github.com/bkryza/clang-uml/releases/download/0.5.1/clang-uml-0.5.1-1.fc39.x86_64.rpm
-sudo dnf install ./clang-uml-0.5.1-1.fc39.x86_64.rpm
+wget https://github.com/bkryza/clang-uml/releases/download/0.5.3/clang-uml-0.5.3-1.fc39.x86_64.rpm
+sudo dnf install ./clang-uml-0.5.3-1.fc39.x86_64.rpm
+
+# Fedora 40
+wget https://github.com/bkryza/clang-uml/releases/download/0.5.3/clang-uml-0.5.3-1.fc40.x86_64.rpm
+sudo dnf install ./clang-uml-0.5.3-1.fc40.x86_64.rpm
 ```

 #### Conda
@@ -53,6 +54,32 @@ conda config --set channel_priority strict
 conda install -c bkryza/label/clang-uml clang-uml
 ```

+#### Nix
+
+You can use the version packaged in nixpkgs like this:
+Currently clang-uml version 0.5.2 is available in nixos-unstable and nixos-24.05
+```bash
+nix-shell -p clang-uml
+```
+
+Or you can build it by yourself
+
+```bash
+# To build it by yourself
+git clone https://github.com/bkryza/clang-uml
+
+# To build using nix flakes
+nix --extra-experimental-features 'nix-command flakes' build
+
+# or without nix flakes
+nix-build -E 'with import <nixpkgs> { }; callPackage ./packaging/nix { }'
+```
+
+Or if you have flake enabled, you can also directly run
+```bash
+nix run github:bkryza/clang-uml
+```
+
 #### Windows

 Download and run the latest Windows installer from
@@ -173,7 +200,7 @@ bin\clang-uml.exe --version
 ```
 It should produce something like:
 ```bash
-clang-uml 0.5.1
+clang-uml 0.5.2
 Copyright (C) 2021-2024 Bartek Kryza <bkryza@gmail.com>
 Linux x86_64 6.5.0-21-generic
 Built against LLVM/Clang libraries version: 17.0.6
--- a/docs/sequence_diagrams.md
+++ b/docs/sequence_diagrams.md
@@ -252,6 +252,17 @@ results in the following diagram:

 ![extension](test_cases/t20012_sequence.svg)

+In case lambda expressions are redundant and we are only interested in the calls
+generate from the lambda expressions, it is possible to inline lambda
+expressions in the generated diagrams by specifying the following option:
+
+```yaml
+inline_lambda_messages: true
+```
+
+For example compare the test cases [t20012](test_cases/t20012.md) and
+[t20052](test_cases/t20052.md).
+
 ## Customizing participants order
 The default participant order in the sequence diagram can be suboptimal in the
 sense that consecutive calls can go right, then left, then right again
--- a/docs/test_cases.md
+++ b/docs/test_cases.md
@@ -80,6 +80,10 @@
 * [t00073](./test_cases/t00073.md) - Class diagram for template overload pattern
 * [t00074](./test_cases/t00074.md) - Test case for rendering concepts without requirements
 * [t00075](./test_cases/t00075.md) - Test case for class diagram styles in config file
+ * [t00076](./test_cases/t00076.md) - Test case for context diagram with inward direction flag
+ * [t00077](./test_cases/t00077.md) - Test case for context diagram with outward direction flag
+ * [t00078](./test_cases/t00078.md) - Test case for context diagram with relationships option
+ * [t00079](./test_cases/t00079.md) - Test case for context diagram exclude filter with relationships option
 ## Sequence diagrams
 * [t20001](./test_cases/t20001.md) - Basic sequence diagram test case
 * [t20002](./test_cases/t20002.md) - Free function sequence diagram test case
@@ -124,6 +128,17 @@
 * [t20041](./test_cases/t20041.md) - Test case for recursive variadic template class call
 * [t20042](./test_cases/t20042.md) - Test case for template overload pattern
 * [t20043](./test_cases/t20043.md) - Test case for elements diagram filter in sequence diagrams
+ * [t20044](./test_cases/t20044.md) - Test case for template method call expressions with callables
+ * [t20045](./test_cases/t20045.md) - Test case for template function call expressions with callables
+ * [t20046](./test_cases/t20046.md) - Test case for call expressions in nested lambdas
+ * [t20047](./test_cases/t20047.md) - Test case for 'call' comment directive
+ * [t20048](./test_cases/t20048.md) - Test case for message comments
+ * [t20049](./test_cases/t20049.md) - Test case for CUDA kernel calls
+ * [t20050](./test_cases/t20050.md) - Test case for CUDA kernel calls with participants combined to file
+ * [t20051](./test_cases/t20051.md) - Test case for CUDA calls callee_type filter
+ * [t20052](./test_cases/t20052.md) - Test case for inlining lambda operator calls
+ * [t20053](./test_cases/t20053.md) - Test case for inlining nested lambda operator calls
+ * [t20054](./test_cases/t20054.md) - Test case for sequence diagram with nested classes
 ## Package diagrams
 * [t30001](./test_cases/t30001.md) - Basic package diagram test case
 * [t30002](./test_cases/t30002.md) - Package dependency test case
--- a/docs/test_cases/t00002.md
+++ b/docs/test_cases/t00002.md
@@ -140,7 +140,7 @@ private:
        "text": "\n \n"
      },
      "display_name": "A",
-      "id": "987634239855407298",
+      "id": "7901073918843258388",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -232,7 +236,7 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "987634239855407298",
+          "id": "7901073918843258388",
          "is_virtual": false,
          "name": "clanguml::t00002::A"
        }
@@ -249,7 +253,7 @@ private:
        "text": "\n \n"
      },
      "display_name": "B",
-      "id": "594234458687375950",
+      "id": "4753875669499007606",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -299,7 +305,7 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "987634239855407298",
+          "id": "7901073918843258388",
          "is_virtual": false,
          "name": "clanguml::t00002::A"
        }
@@ -317,7 +323,7 @@ private:
        "text": "\n \n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad.\n"
      },
      "display_name": "C",
-      "id": "1142499429598587507",
+      "id": "9139995436788700062",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -375,13 +383,13 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "594234458687375950",
+          "id": "4753875669499007606",
          "is_virtual": false,
          "name": "clanguml::t00002::B"
        },
        {
          "access": "public",
-          "id": "1142499429598587507",
+          "id": "9139995436788700062",
          "is_virtual": false,
          "name": "clanguml::t00002::C"
        }
@@ -395,7 +403,7 @@ private:
        "text": "\n This is class D\n which is a little like B\n and a little like C\n"
      },
      "display_name": "D",
-      "id": "60950494980414724",
+      "id": "487603959843317797",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -508,19 +520,19 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "594234458687375950",
+          "id": "4753875669499007606",
          "is_virtual": true,
          "name": "clanguml::t00002::B"
        },
        {
          "access": "public",
-          "id": "1142499429598587507",
+          "id": "9139995436788700062",
          "is_virtual": true,
          "name": "clanguml::t00002::C"
        }
      ],
      "display_name": "E",
-      "id": "2237886670308966220",
+      "id": "17903093362471729766",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -635,52 +651,52 @@ private:
  "relationships": [
    {
      "access": "public",
-      "destination": "987634239855407298",
-      "source": "594234458687375950",
+      "destination": "7901073918843258388",
+      "source": "4753875669499007606",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "987634239855407298",
-      "source": "1142499429598587507",
+      "destination": "7901073918843258388",
+      "source": "9139995436788700062",
      "type": "extension"
    },
    {
      "access": "private",
-      "destination": "987634239855407298",
+      "destination": "7901073918843258388",
      "label": "as",
-      "source": "60950494980414724",
+      "source": "487603959843317797",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "594234458687375950",
-      "source": "60950494980414724",
+      "destination": "4753875669499007606",
+      "source": "487603959843317797",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1142499429598587507",
-      "source": "60950494980414724",
+      "destination": "9139995436788700062",
+      "source": "487603959843317797",
      "type": "extension"
    },
    {
      "access": "private",
-      "destination": "987634239855407298",
+      "destination": "7901073918843258388",
      "label": "as",
-      "source": "2237886670308966220",
+      "source": "17903093362471729766",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "594234458687375950",
-      "source": "2237886670308966220",
+      "destination": "4753875669499007606",
+      "source": "17903093362471729766",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1142499429598587507",
-      "source": "2237886670308966220",
+      "destination": "9139995436788700062",
+      "source": "17903093362471729766",
      "type": "extension"
    }
  ],
--- 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="f1evl5hieo55bx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1q2qgu2mpw38v" 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,148 +10,148 @@
  </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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1evl5hieo55bx)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q2qgu2mpw38v)" height="73.6094" id="C_0007901073918843258388" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L10" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L10" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L12" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L12" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1evl5hieo55bx)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q2qgu2mpw38v)" height="60.8047" id="C_0004753875669499007606" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L18" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L18" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/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(#f1evl5hieo55bx)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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(#f1q2qgu2mpw38v)" height="60.8047" id="C_0009139995436788700062" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L30" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L30" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1evl5hieo55bx)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q2qgu2mpw38v)" height="86.4141" id="C_0000487603959843317797" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L41" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L41" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L50" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L50" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1evl5hieo55bx)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1q2qgu2mpw38v)" height="86.4141" id="C_0017903093362471729766" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L66" xlink:show="new" xlink:title="foo_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L66" target="_top" title="foo_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L75" xlink:show="new" xlink:title="foo_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L75" target="_top" title="foo_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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(#f1evl5hieo55bx)" 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(#f1q2qgu2mpw38v)" 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(#f1evl5hieo55bx)" 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(#f1q2qgu2mpw38v)" 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(#f1evl5hieo55bx)" 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(#f1q2qgu2mpw38v)" 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>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="130" x="223" y="333.2856">which is a little like B</text>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="105" x="223" y="348.4185">and a little like C</text>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="227" y="363.5513"/>
-    <path d="M275.32,103.9131 C250.75,115.3331 227.18,126.5731 215.5,132.9531 C198.38,142.3031 180.15,153.4731 164.22,163.6531 " fill="none" id="C_0000987634239855407298&lt;-C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M275.32,103.9131 C250.75,115.3331 227.18,126.5731 215.5,132.9531 C198.38,142.3031 180.15,153.4731 164.22,163.6531 " fill="none" id="C_0007901073918843258388&lt;-C_0004753875669499007606" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="272.59,97.4631,293.68,95.4331,278.46,110.1731,272.59,97.4631" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M356.5,123.5031 C356.5,137.3331 356.5,151.5931 356.5,163.5931 " fill="none" id="C_0000987634239855407298&lt;-C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M356.5,123.5031 C356.5,137.3331 356.5,151.5931 356.5,163.5931 " fill="none" id="C_0007901073918843258388&lt;-C_0009139995436788700062" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="349.5,123.2031,356.5,103.2031,363.5,123.2031,349.5,123.2031" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M146.15,285.8431 C176.88,252.5231 221.11,204.9431 260.5,163.9531 C278.66,145.0531 299.06,124.3731 316.36,106.9831 " fill="none" id="C_0000060950494980414724-&gt;C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M146.15,285.8431 C176.88,252.5231 221.11,204.9431 260.5,163.9531 C278.66,145.0531 299.06,124.3731 316.36,106.9831 " fill="none" id="C_0000487603959843317797-&gt;C_0007901073918843258388" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="320.23,103.0931,311.0448,106.6472,316.7016,106.6358,316.713,112.2926,320.23,103.0931" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="263.5" y="192.0195"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="273.5" y="199.02">as</text>
-    <path d="M114.96,245.5631 C113.76,258.8031 112.48,272.9731 111.32,285.7531 " fill="none" id="C_0000594234458687375950&lt;-C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M114.96,245.5631 C113.76,258.8031 112.48,272.9731 111.32,285.7531 " fill="none" id="C_0004753875669499007606&lt;-C_0000487603959843317797" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="108.03,244.4731,116.81,225.1931,121.97,245.7431,108.03,244.4731" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M299.39,236.4931 C288.99,243.3231 278.07,250.0931 267.5,255.9531 C238.61,271.9731 229.64,272.4231 199.5,285.9531 C193.73,288.5431 187.77,291.2331 181.78,293.9431 " fill="none" id="C_0001142499429598587507&lt;-C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M299.39,236.4931 C288.99,243.3231 278.07,250.0931 267.5,255.9531 C238.61,271.9731 229.64,272.4231 199.5,285.9531 C193.73,288.5431 187.77,291.2331 181.78,293.9431 " fill="none" id="C_0009139995436788700062&lt;-C_0000487603959843317797" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="295.79,230.4731,316.28,225.0731,303.64,242.0731,295.79,230.4731" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M467.23,285.8831 C458.11,251.9631 443.18,203.5431 423.5,163.9531 C413.76,144.3531 400.46,124.2031 388.29,107.3831 " fill="none" id="C_0002237886670308966220-&gt;C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M467.23,285.8831 C458.11,251.9631 443.18,203.5431 423.5,163.9531 C413.76,144.3531 400.46,124.2031 388.29,107.3831 " fill="none" id="C_0017903093362471729766-&gt;C_0007901073918843258388" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="385.22,103.1831,387.3048,112.8088,388.1719,107.2188,393.7619,108.0858,385.22,103.1831" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="451.5" y="192.0195"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="461.5" y="199.02">as</text>
-    <path d="M188.64,221.4631 C191.97,222.6531 195.27,223.8231 198.5,224.9531 C281.02,253.8031 304.05,254.1931 385.5,285.9531 C391.39,288.2531 397.44,290.7331 403.49,293.3031 " fill="none" id="C_0000594234458687375950&lt;-C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M188.64,221.4631 C191.97,222.6531 195.27,223.8231 198.5,224.9531 C281.02,253.8031 304.05,254.1931 385.5,285.9531 C391.39,288.2531 397.44,290.7331 403.49,293.3031 " fill="none" id="C_0004753875669499007606&lt;-C_0017903093362471729766" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="185.93,227.9231,169.53,214.5031,190.72,214.7731,185.93,227.9231" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M397.5,240.3431 C410.91,255.0331 425.74,271.2831 438.96,285.7531 " fill="none" id="C_0001142499429598587507&lt;-C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M397.5,240.3431 C410.91,255.0331 425.74,271.2831 438.96,285.7531 " fill="none" id="C_0009139995436788700062&lt;-C_0017903093362471729766" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="391.97,244.6731,383.65,225.1931,402.31,235.2331,391.97,244.6731" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00002_class_mermaid.svg
+++ b/docs/test_cases/t00002_class_mermaid.svg
@@ -169,8 +169,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L7">
-          <g title="This is class A" id="classId-C_0000987634239855407298-0" class="node default clickable">
+        <a transform="translate(387.6328125, 152.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L7">
+          <g title="This is class A" id="classId-C_0007901073918843258388-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"/>
            <line y2="6.5" y1="6.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -198,8 +198,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L16">
-          <g title="This is class B" id="classId-C_0000594234458687375950-1" class="node default clickable">
+        <a transform="translate(576.13671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L16">
+          <g title="This is class B" id="classId-C_0004753875669499007606-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"/>
            <line y2="6.5" y1="6.5" x2="58.8671875" x1="-58.8671875" class="divider"/>
@@ -222,8 +222,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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">
+        <a transform="translate(335.3671875, 307.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L27">
+          <g title="This is class C - class C has a long comment" id="classId-C_0009139995436788700062-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"/>
            <line y2="6.5" y1="6.5" x2="58.4140625" x1="-58.4140625" class="divider"/>
@@ -246,8 +246,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L36">
-          <g title="D" id="classId-C_0000060950494980414724-3" class="node default clickable">
+        <a transform="translate(186.23828125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L36">
+          <g title="D" id="classId-C_0000487603959843317797-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"/>
            <line y2="6.5" y1="6.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
@@ -280,8 +280,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00002/t00002.cc#L61">
-          <g title="E" id="classId-C_0002237886670308966220-4" class="node default clickable">
+        <a transform="translate(513.64453125, 462.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00002/t00002.cc#L61">
+          <g title="E" id="classId-C_0017903093362471729766-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"/>
            <line y2="6.5" y1="6.5" x2="81.7578125" x1="-81.7578125" class="divider"/>
--- a/docs/test_cases/t00003.md
+++ b/docs/test_cases/t00003.md
@@ -104,7 +104,7 @@ int A::static_int = 1;
    {
      "bases": [],
      "display_name": "A",
-      "id": "1371951663534295727",
+      "id": "10975613308274365816",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
--- 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="f13g9efd4lrxj8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1h7j0gmw5hza3" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13g9efd4lrxj8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h7j0gmw5hza3)" height="468.9453" id="C_0010975613308274365816" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L23" xlink:show="new" xlink:title="~A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L23" target="_top" title="~A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L36" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L37" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L30" xlink:show="new" xlink:title="operator++" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L30" target="_top" title="operator++" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L28" xlink:show="new" xlink:title="auto_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L28" target="_top" title="auto_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L25" xlink:show="new" xlink:title="basic_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L25" target="_top" title="basic_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L27" xlink:show="new" xlink:title="const_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L27" target="_top" title="const_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L50" target="_top" title="create_from_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="default_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L44" target="_top" title="default_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L45" xlink:show="new" xlink:title="default_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L45" target="_top" title="default_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L41" xlink:show="new" xlink:title="double_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L41" target="_top" title="double_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L67" xlink:show="new" xlink:title="private_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L67" target="_top" title="private_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L58" xlink:show="new" xlink:title="protected_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L58" target="_top" title="protected_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L39" xlink:show="new" xlink:title="size" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L39" target="_top" title="size" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L26" xlink:show="new" xlink:title="static_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L26" target="_top" title="static_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="sum" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L42" target="_top" title="sum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L70" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L55" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L55" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L70" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L70" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L70" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L62" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L62" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L69" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L69" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L60" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L60" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L52" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L54" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L53" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L53" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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>
--- a/docs/test_cases/t00003_class_mermaid.svg
+++ b/docs/test_cases/t00003_class_mermaid.svg
@@ -52,8 +52,8 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00003/t00003.cc#L7">
-          <g title="A" id="classId-C_0001371951663534295727-0" class="node default clickable">
+        <a transform="translate(200.375, 377.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00003/t00003.cc#L7">
+          <g title="A" id="classId-C_0010975613308274365816-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"/>
            <line y2="-103.5" y1="-103.5" x2="192.375" x1="-192.375" class="divider"/>
--- a/docs/test_cases/t00004.md
+++ b/docs/test_cases/t00004.md
--- 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="537px" preserveAspectRatio="none" style="width:1131px;height:537px;" version="1.1" viewBox="0 0 1131 537" width="1131px" zoomAndPan="magnify">
  <defs>
-    <filter height="300%" id="f1m3z14o51bgkf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1mseet8j3n6ql" 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,237 +9,281 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L4" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="86.4141" id="C_0008844195389762820798" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="171"/>
+      <ellipse cx="21" cy="187" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M25.1094,193 L17.3906,193 L17.3906,180.6094 L25.1094,180.6094 L25.1094,182.7656 L19.8438,182.7656 L19.8438,185.4375 L24.6094,185.4375 L24.6094,187.5938 L19.8438,187.5938 L19.8438,190.8438 L25.1094,190.8438 L25.1094,193 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="191.1543">Color</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="203" y2="203"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="12" y="217.2104">Red</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="12" y="230.0151">Green</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="12" y="242.8198">Blue</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="249.4141" y2="249.4141"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="40" y2="40"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="54.2104">AA_1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="67.0151">AA_2</text>
-      <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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="73.6094" id="C_0009860995429872413691" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="70" y="14"/>
+      <ellipse cx="114.75" cy="30" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M117.7188,35.6406 Q117.1406,35.9375 116.5,36.0781 Q115.8594,36.2344 115.1563,36.2344 Q112.6563,36.2344 111.3281,34.5938 Q110.0156,32.9375 110.0156,29.8125 Q110.0156,26.6875 111.3281,25.0313 Q112.6563,23.375 115.1563,23.375 Q115.8594,23.375 116.5,23.5313 Q117.1563,23.6875 117.7188,23.9844 L117.7188,26.7031 Q117.0938,26.125 116.5,25.8594 Q115.9063,25.5781 115.2813,25.5781 Q113.9375,25.5781 113.25,26.6563 Q112.5625,27.7188 112.5625,29.8125 Q112.5625,31.9063 113.25,32.9844 Q113.9375,34.0469 115.2813,34.0469 Q115.9063,34.0469 116.5,33.7813 Q117.0938,33.5 117.7188,32.9219 L117.7188,35.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="135.25" y="34.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="175" y1="46" y2="46"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="175" y1="54" y2="54"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L10" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L10" xlink:show="new" xlink:title="aa" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="60"/>
+      <ellipse cx="81" cy="65" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L10" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L10" xlink:show="new" xlink:title="aa" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="90" y="68.2104">aa : AA</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L11" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L11" target="_top" title="color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="color" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="72.8047"/>
+      <ellipse cx="81" cy="77.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L11" target="_top" title="color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L11" xlink:show="new" xlink:title="color" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="80" x="90" y="81.0151">color : Color *</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L20" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L8" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L8" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="86.4141" id="C_0013041644057721012989" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="124" y="171"/>
+      <ellipse cx="139" cy="187" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M143.1094,193 L135.3906,193 L135.3906,180.6094 L143.1094,180.6094 L143.1094,182.7656 L137.8438,182.7656 L137.8438,185.4375 L142.6094,185.4375 L142.6094,187.5938 L137.8438,187.5938 L137.8438,190.8438 L143.1094,190.8438 L143.1094,193 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="153" y="191.1543">B::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="125" x2="187" y1="203" y2="203"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="130" y="217.2104">AA_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="130" y="230.0151">AA_2</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="130" y="242.8198">AA_3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="125" x2="187" y1="249.4141" y2="249.4141"/>
    </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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="73.6094" id="C_0012418199527012894198" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="203.5" y="453"/>
+      <ellipse cx="259.75" cy="469" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M262.7188,474.6406 Q262.1406,474.9375 261.5,475.0781 Q260.8594,475.2344 260.1563,475.2344 Q257.6563,475.2344 256.3281,473.5938 Q255.0156,471.9375 255.0156,468.8125 Q255.0156,465.6875 256.3281,464.0313 Q257.6563,462.375 260.1563,462.375 Q260.8594,462.375 261.5,462.5313 Q262.1563,462.6875 262.7188,462.9844 L262.7188,465.7031 Q262.0938,465.125 261.5,464.8594 Q260.9063,464.5781 260.2813,464.5781 Q258.9375,464.5781 258.25,465.6563 Q257.5625,466.7188 257.5625,468.8125 Q257.5625,470.9063 258.25,471.9844 Q258.9375,473.0469 260.2813,473.0469 Q260.9063,473.0469 261.5,472.7813 Q262.0938,472.5 262.7188,471.9219 L262.7188,474.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="280.25" y="473.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="331.5" y1="485" y2="485"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="40" y2="40"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="111.5" y="54.2104">Green</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="111.5" y="67.0151">Yellow</text>
-      <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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.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="209.5" y="491"/>
+      <ellipse cx="214.5" cy="496" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="223.5" y="499.2104">foo() const : void</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="479" y="24"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="480" y="36.1387">int</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L27" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="209.5" y="503.8047"/>
+      <ellipse cx="214.5" cy="508.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="589.5" y="287"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="590.5" y="299.1387">T</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="330" y2="330"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L27" target="_top" title="foo2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="foo2" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="223.5" y="512.0151">foo2() const : void</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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;"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="331.5" y1="518.6094" y2="518.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L18" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L18" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="48" id="C_0013939998749822876416" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="236" y="331"/>
+      <ellipse cx="251" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M253.9688,352.6406 Q253.3906,352.9375 252.75,353.0781 Q252.1094,353.2344 251.4063,353.2344 Q248.9063,353.2344 247.5781,351.5938 Q246.2656,349.9375 246.2656,346.8125 Q246.2656,343.6875 247.5781,342.0313 Q248.9063,340.375 251.4063,340.375 Q252.1094,340.375 252.75,340.5313 Q253.4063,340.6875 253.9688,340.9844 L253.9688,343.7031 Q253.3438,343.125 252.75,342.8594 Q252.1563,342.5781 251.5313,342.5781 Q250.1875,342.5781 249.5,343.6563 Q248.8125,344.7188 248.8125,346.8125 Q248.8125,348.9063 249.5,349.9844 Q250.1875,351.0469 251.5313,351.0469 Q252.1563,351.0469 252.75,350.7813 Q253.3438,350.5 253.9688,349.9219 L253.9688,352.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="265" y="351.1543">A::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="237" x2="299" y1="363" y2="363"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="237" x2="299" y1="371" y2="371"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L20" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L20" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="86.4141" id="C_0004727494996070729955" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="294.5" y="171"/>
+      <ellipse cx="309.5" cy="187" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M313.6094,193 L305.8906,193 L305.8906,180.6094 L313.6094,180.6094 L313.6094,182.7656 L308.3438,182.7656 L308.3438,185.4375 L313.1094,185.4375 L313.1094,187.5938 L308.3438,187.5938 L308.3438,190.8438 L313.6094,190.8438 L313.6094,193 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="323.5" y="191.1543">A::AA::Lights</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295.5" x2="402.5" y1="203" y2="203"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="300.5" y="217.2104">Green</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="300.5" y="230.0151">Yellow</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="300.5" y="242.8198">Red</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="295.5" x2="402.5" y1="249.4141" y2="249.4141"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L22" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L22" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="60.8047" id="C_0011441493064034257052" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="286.5" y="20.5"/>
+      <ellipse cx="304.65" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M307.6188,42.1406 Q307.0406,42.4375 306.4,42.5781 Q305.7594,42.7344 305.0563,42.7344 Q302.5563,42.7344 301.2281,41.0938 Q299.9156,39.4375 299.9156,36.3125 Q299.9156,33.1875 301.2281,31.5313 Q302.5563,29.875 305.0563,29.875 Q305.7594,29.875 306.4,30.0313 Q307.0563,30.1875 307.6188,30.4844 L307.6188,33.2031 Q306.9938,32.625 306.4,32.3594 Q305.8063,32.0781 305.1813,32.0781 Q303.8375,32.0781 303.15,33.1563 Q302.4625,34.2188 302.4625,36.3125 Q302.4625,38.4063 303.15,39.4844 Q303.8375,40.5469 305.1813,40.5469 Q305.8063,40.5469 306.4,40.2813 Q306.9938,40 307.6188,39.4219 L307.6188,42.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="319.35" y="40.6543">A::AA::AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="287.5" x2="388.5" y1="52.5" y2="52.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="287.5" x2="388.5" y1="60.5" y2="60.5"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L23" target="_top" title="lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="lights" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="292.5" y="66.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="294.5" y="68.5"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L23" target="_top" title="lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="lights" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="306.5" y="74.7104">lights : Lights</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L40" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L40" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="48" id="C_0002302554954640607720" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="467" y="27"/>
+      <ellipse cx="482" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M484.9688,48.6406 Q484.3906,48.9375 483.75,49.0781 Q483.1094,49.2344 482.4063,49.2344 Q479.9063,49.2344 478.5781,47.5938 Q477.2656,45.9375 477.2656,42.8125 Q477.2656,39.6875 478.5781,38.0313 Q479.9063,36.375 482.4063,36.375 Q483.1094,36.375 483.75,36.5313 Q484.4063,36.6875 484.9688,36.9844 L484.9688,39.7031 Q484.3438,39.125 483.75,38.8594 Q483.1563,38.5781 482.5313,38.5781 Q481.1875,38.5781 480.5,39.6563 Q479.8125,40.7188 479.8125,42.8125 Q479.8125,44.9063 480.5,45.9844 Q481.1875,47.0469 482.5313,47.0469 Q483.1563,47.0469 483.75,46.7813 Q484.3438,46.5 484.9688,45.9219 L484.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="496" y="47.1543">C::B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="18" x="528" y="24"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="529" y="36.1387">int</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="542" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="468" x2="542" y1="67" y2="67"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="46" y2="46"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="60.2104">CCC_1</text>
-      <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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L30" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="73.6094" id="C_0018226625421819521092" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="562.5" y="318"/>
+      <ellipse cx="601.8" cy="334" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M604.7688,339.6406 Q604.1906,339.9375 603.55,340.0781 Q602.9094,340.2344 602.2063,340.2344 Q599.7063,340.2344 598.3781,338.5938 Q597.0656,336.9375 597.0656,333.8125 Q597.0656,330.6875 598.3781,329.0313 Q599.7063,327.375 602.2063,327.375 Q602.9094,327.375 603.55,327.5313 Q604.2063,327.6875 604.7688,327.9844 L604.7688,330.7031 Q604.1438,330.125 603.55,329.8594 Q602.9563,329.5781 602.3313,329.5781 Q600.9875,329.5781 600.3,330.6563 Q599.6125,331.7188 599.6125,333.8125 Q599.6125,335.9063 600.3,336.9844 Q600.9875,338.0469 602.3313,338.0469 Q602.9563,338.0469 603.55,337.7813 Q604.1438,337.5 604.7688,336.9219 L604.7688,339.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="621.2" y="338.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="661.5" y="315"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="662.5" y="327.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="563.5" x2="666.5" y1="350" y2="350"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="563.5" x2="666.5" y1="358" y2="358"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="427" y="158.5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="428" y="170.6387">V</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="201.5" y2="201.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L44" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L44" 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="568.5" y="364"/>
+      <ellipse cx="573.5" cy="369" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L44" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L44" 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="582.5" y="372.2104">b_int : B&lt;int&gt;</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L32" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L32" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="568.5" y="376.8047"/>
+      <ellipse cx="573.5" cy="381.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="187" y2="187"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="201.2104">CC_1</text>
-      <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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L32" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L32" xlink:show="new" xlink:title="t" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="582.5" y="385.0151">t : T</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L34" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="48" id="C_0004991521063183421232" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="657" y="190"/>
+      <ellipse cx="672" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M674.9688,211.6406 Q674.3906,211.9375 673.75,212.0781 Q673.1094,212.2344 672.4063,212.2344 Q669.9063,212.2344 668.5781,210.5938 Q667.2656,208.9375 667.2656,205.8125 Q667.2656,202.6875 668.5781,201.0313 Q669.9063,199.375 672.4063,199.375 Q673.1094,199.375 673.75,199.5313 Q674.4063,199.6875 674.9688,199.9844 L674.9688,202.7031 Q674.3438,202.125 673.75,201.8594 Q673.1563,201.5781 672.5313,201.5781 Q671.1875,201.5781 670.5,202.6563 Q669.8125,203.7188 669.8125,205.8125 Q669.8125,207.9063 670.5,208.9844 Q671.1875,210.0469 672.5313,210.0469 Q673.1563,210.0469 673.75,209.7813 Q674.3438,209.5 674.9688,208.9219 L674.9688,211.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="686" y="210.1543">C::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="658" x2="720" y1="222" y2="222"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="658" x2="720" y1="230" y2="230"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="40" y2="40"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="54.2104">AA_1</text>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="67.0151">AA_2</text>
-      <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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L35" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L35" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="48" id="C_0012782408698292006929" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="605" y="27"/>
+      <ellipse cx="620" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M622.9688,48.6406 Q622.3906,48.9375 621.75,49.0781 Q621.1094,49.2344 620.4063,49.2344 Q617.9063,49.2344 616.5781,47.5938 Q615.2656,45.9375 615.2656,42.8125 Q615.2656,39.6875 616.5781,38.0313 Q617.9063,36.375 620.4063,36.375 Q621.1094,36.375 621.75,36.5313 Q622.4063,36.6875 622.9688,36.9844 L622.9688,39.7031 Q622.3438,39.125 621.75,38.8594 Q621.1563,38.5781 620.5313,38.5781 Q619.1875,38.5781 618.5,39.6563 Q617.8125,40.7188 617.8125,42.8125 Q617.8125,44.9063 618.5,45.9844 Q619.1875,47.0469 620.5313,47.0469 Q621.1563,47.0469 621.75,46.7813 Q622.3438,46.5 622.9688,45.9219 L622.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="634" y="47.1543">C::AA::AAA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="606" x2="700" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="606" x2="700" y1="67" y2="67"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1m3z14o51bgkf)" 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>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951" x2="1059" y1="59" y2="59"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="951" x2="1059" y1="67" y2="67"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L37" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="73.6094" id="C_0000654553621116797875" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="736" y="14"/>
+      <ellipse cx="751" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M755.1094,36 L747.3906,36 L747.3906,23.6094 L755.1094,23.6094 L755.1094,25.7656 L749.8438,25.7656 L749.8438,28.4375 L754.6094,28.4375 L754.6094,30.5938 L749.8438,30.5938 L749.8438,33.8438 L755.1094,33.8438 L755.1094,36 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="765" y="34.1543">C::AA::CCC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="737" x2="831" y1="46" y2="46"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="742" y="60.2104">CCC_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="742" y="73.0151">CCC_2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="737" x2="831" y1="79.6094" y2="79.6094"/>
    </a>
-    <path d="M38,94.08 C38,112.65 38,134.33 38,152.47 " fill="none" id="C_0001630205507215126623-&gt;C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="38" cy="159.64" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="38" y1="151.64" y2="167.64"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="30" y1="159.64" y2="159.64"/>
-    <path d="M241,216.17 C241,232.28 241,254.4 241,274.57 " fill="none" id="C_0001742499843727859552-&gt;C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="241" cy="281.83" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="241" y1="273.83" y2="289.83"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="249" x2="233" y1="281.83" y2="281.83"/>
-    <path d="M184.52,94.08 C195.78,113.41 209.01,136.1 219.83,154.66 " fill="none" id="C_0000590936874508841244-&gt;C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="223.3652" cy="160.7262" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="219.3404" x2="227.39" y1="153.8124" y2="167.64"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="230.279" x2="216.4514" y1="156.7014" y2="164.751"/>
-    <path d="M288.46,75.27 C279.7,96.61 266.58,128.62 256.35,153.56 " fill="none" id="C_0001430186633004282131-&gt;C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="253.6041" cy="160.2577" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="256.6382" x2="250.57" y1="152.8554" y2="167.66"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="261.0064" x2="246.2018" y1="163.2918" y2="157.2236"/>
-    <path d="M446.63,75.27 C439.26,93.56 428.74,119.67 419.56,142.46 " fill="none" id="C_0000287819369330075965-&gt;C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="425.91,145.42,411.94,161.36,412.92,140.19,425.91,145.42" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M527.6,277.5 C508.75,218.12 477.58,119.97 463.42,75.36 " fill="none" id="C_0002278328177727440136&lt;-C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="531.54,289.91,533.5388,282.9814,527.9119,278.4716,525.9132,285.4002,531.54,289.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="519" cy="192.5664" 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="31" x="526" y="196.5669">b_int</text>
-    <path d="M603.28,216.17 C594.14,232.83 581.46,255.93 570.09,276.65 " fill="none" id="C_0000623940132897927654-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="566.6995" cy="282.8171" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="570.549" x2="562.85" y1="275.8041" y2="289.83"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="573.7124" x2="559.6866" y1="286.6666" y2="278.9676"/>
-    <path d="M596.85,75.27 C600.35,96.41 605.58,128.02 609.69,152.86 " fill="none" id="C_0001597801087286500866-&gt;C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="610.8297" cy="159.768" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="609.5195" x2="612.14" y1="151.8761" y2="167.66"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="618.7217" x2="602.9378" y1="158.4578" y2="161.0783"/>
-    <path d="M695.91,88.16 C679.76,108.94 659.56,134.94 643.51,155.59 " fill="none" id="C_0000081819202639599734-&gt;C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="639.0389" cy="161.3531" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="643.9478" x2="634.13" y1="155.0363" y2="167.67"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="645.3558" x2="632.722" y1="166.262" y2="156.4442"/>
-    <path d="M431.74,222.52 C449.79,239.31 472.8,260.71 493.2,279.68 " fill="none" id="C_0001381298335849583950-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="498.3612" cy="284.4826" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="492.5024" x2="504.22" y1="279.0352" y2="289.93"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="503.8086" x2="492.9138" y1="278.6238" y2="290.3414"/>
-    <path d="M682.65,218.02 C659.95,235.57 628.94,259.54 601.92,280.44 " fill="none" id="C_0002037378936100378699-&gt;C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="596.1479" cy="284.9054" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="602.4759" x2="589.82" y1="280.0108" y2="289.8"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="601.0425" x2="591.2533" y1="291.2333" y2="278.5775"/>
-    <path d="M882.8,94.08 C892.71,113.22 904.33,135.65 913.9,154.12 " fill="none" id="C_0001572080057917630922-&gt;C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="917.219" cy="160.5372" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="913.538" x2="920.9" y1="153.4343" y2="167.64"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="924.3219" x2="910.1162" y1="156.8562" y2="164.2181"/>
-    <path d="M992.95,75.27 C981.79,96.81 965,129.22 952.03,154.26 " fill="none" id="C_0000600916232677555492-&gt;C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <ellipse cx="948.771" cy="160.5572" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="952.452" x2="945.09" y1="153.4543" y2="167.66"/>
-    <line style="stroke: #A80036; stroke-width: 1.0;" x1="955.8738" x2="941.6681" y1="164.2381" y2="156.8762"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L40" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L40" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="60.8047" id="C_0011050386686796671606" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="439" y="183.5"/>
+      <ellipse cx="454" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M456.9688,205.1406 Q456.3906,205.4375 455.75,205.5781 Q455.1094,205.7344 454.4063,205.7344 Q451.9063,205.7344 450.5781,204.0938 Q449.2656,202.4375 449.2656,199.3125 Q449.2656,196.1875 450.5781,194.5313 Q451.9063,192.875 454.4063,192.875 Q455.1094,192.875 455.75,193.0313 Q456.4063,193.1875 456.9688,193.4844 L456.9688,196.2031 Q456.3438,195.625 455.75,195.3594 Q455.1563,195.0781 454.5313,195.0781 Q453.1875,195.0781 452.5,196.1563 Q451.8125,197.2188 451.8125,199.3125 Q451.8125,201.4063 452.5,202.4844 Q453.1875,203.5469 454.5313,203.5469 Q455.1563,203.5469 455.75,203.2813 Q456.3438,203 456.9688,202.4219 L456.9688,205.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="468" y="203.6543">C::B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="10" x="500" y="180.5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="501" y="192.6387">V</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="440" x2="506" y1="215.5" y2="215.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="440" x2="506" y1="223.5" y2="223.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L41" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L41" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="445" y="229.5"/>
+      <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="447" y="231.5"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L41" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L41" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="459" y="237.7104">b : V</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L46" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L46" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="73.6094" id="C_0016299031488803029599" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="756" y="177"/>
+      <ellipse cx="771" cy="193" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M775.1094,199 L767.3906,199 L767.3906,186.6094 L775.1094,186.6094 L775.1094,188.7656 L769.8438,188.7656 L769.8438,191.4375 L774.6094,191.4375 L774.6094,193.5938 L769.8438,193.5938 L769.8438,196.8438 L775.1094,196.8438 L775.1094,199 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="785" y="197.1543">C::CC</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="819" y1="209" y2="209"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="762" y="223.2104">CC_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="762" y="236.0151">CC_2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="819" y1="242.6094" y2="242.6094"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L50" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L50" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="48" id="C_0004897065367017086369" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="951" y="190"/>
+      <ellipse cx="966" cy="206" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M968.9688,211.6406 Q968.3906,211.9375 967.75,212.0781 Q967.1094,212.2344 966.4063,212.2344 Q963.9063,212.2344 962.5781,210.5938 Q961.2656,208.9375 961.2656,205.8125 Q961.2656,202.6875 962.5781,201.0313 Q963.9063,199.375 966.4063,199.375 Q967.1094,199.375 967.75,199.5313 Q968.4063,199.6875 968.9688,199.9844 L968.9688,202.7031 Q968.3438,202.125 967.75,201.8594 Q967.1563,201.5781 966.5313,201.5781 Q965.1875,201.5781 964.5,202.6563 Q963.8125,203.7188 963.8125,205.8125 Q963.8125,207.9063 964.5,208.9844 Q965.1875,210.0469 966.5313,210.0469 Q967.1563,210.0469 967.75,209.7813 Q968.3438,209.5 968.9688,208.9219 L968.9688,211.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="980" y="210.1543">detail::D</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1034" y1="222" y2="222"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1034" y1="230" y2="230"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L52" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L52" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="86.4141" id="C_0012576640463341047379" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="8"/>
+      <ellipse cx="882" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M886.1094,30 L878.3906,30 L878.3906,17.6094 L886.1094,17.6094 L886.1094,19.7656 L880.8438,19.7656 L880.8438,22.4375 L885.6094,22.4375 L885.6094,24.5938 L880.8438,24.5938 L880.8438,27.8438 L886.1094,27.8438 L886.1094,30 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="896" y="28.1543">detail::D::AA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="868" x2="974" y1="40" y2="40"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="873" y="54.2104">AA_1</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="873" y="67.0151">AA_2</text>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="873" y="79.8198">AA_3</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="868" x2="974" y1="86.4141" y2="86.4141"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L54" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L54" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mseet8j3n6ql)" height="48" id="C_0004807329861420443943" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="1010" y="27"/>
+      <ellipse cx="1025" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M1027.9688,48.6406 Q1027.3906,48.9375 1026.75,49.0781 Q1026.1094,49.2344 1025.4063,49.2344 Q1022.9063,49.2344 1021.5781,47.5938 Q1020.2656,45.9375 1020.2656,42.8125 Q1020.2656,39.6875 1021.5781,38.0313 Q1022.9063,36.375 1025.4063,36.375 Q1026.1094,36.375 1026.75,36.5313 Q1027.4063,36.6875 1027.9688,36.9844 L1027.9688,39.7031 Q1027.3438,39.125 1026.75,38.8594 Q1026.1563,38.5781 1025.5313,38.5781 Q1024.1875,38.5781 1023.5,39.6563 Q1022.8125,40.7188 1022.8125,42.8125 Q1022.8125,44.9063 1023.5,45.9844 Q1024.1875,47.0469 1025.5313,47.0469 Q1026.1563,47.0469 1026.75,46.7813 Q1027.3438,46.5 1027.9688,45.9219 L1027.9688,48.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="1039" y="47.1543">detail::D::DD</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1011" x2="1119" y1="59" y2="59"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="1011" x2="1119" y1="67" y2="67"/>
+    </a>
+    <path d="M116.71,101.49 C116.32,114.48 117.02,128.38 120,141 C122.38,151.07 126.39,161.33 130.89,170.83 " fill="none" id="C_0009860995429872413691&lt;-C_0013041644057721012989" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="117.48,88.37,113.1372,94.1267,116.7807,100.3496,121.1236,94.5929,117.48,88.37" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="126" cy="133.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="16" x="133" y="137.0669">aa</text>
+    <path d="M158.34,170.95 C158.31,155.98 157.29,139.1 154,124 C152.41,116.72 150.09,109.26 147.41,102.03 " fill="none" id="C_0013041644057721012989-&gt;C_0009860995429872413691" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="144.7657" cy="95.4998" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="147.7814" x2="141.75" y1="102.9096" y2="88.09"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.3559" x2="152.1755" y1="98.5155" y2="92.4841"/>
+    <path d="M89.38,88.19 C80.52,99.1 71.6,111.51 65,124 C58.14,136.97 52.75,151.94 48.65,165.86 " fill="none" id="C_0009860995429872413691-&gt;C_0008844195389762820798" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="47.2,170.93,53.5127,163.3702,48.5698,166.1213,45.8187,161.1785,47.2,170.93" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="71" cy="133.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="31" x="78" y="137.0669">color</text>
+    <path d="M268,379.17 C268,395.28 268,417.4 268,437.57 " fill="none" id="C_0013939998749822876416-&gt;C_0012418199527012894198" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="268" cy="444.83" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="268" x2="268" y1="436.83" y2="452.83"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="276" x2="260" y1="444.83" y2="444.83"/>
+    <path d="M324.48,257.08 C313.22,276.41 299.99,299.1 289.17,317.66 " fill="none" id="C_0004727494996070729955-&gt;C_0013939998749822876416" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="285.6348" cy="323.7262" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="289.6596" x2="281.61" y1="316.8124" y2="330.64"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5486" x2="278.721" y1="327.751" y2="319.7014"/>
+    <path d="M318.15,81.86 C303.86,105.09 285.64,138.7 277,171 C263.97,219.72 263.62,278.28 265.25,315.81 " fill="none" id="C_0011441493064034257052-&gt;C_0013939998749822876416" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="265.6435" cy="323.0014" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="265.2171" x2="266.07" y1="315.0128" y2="330.99"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="273.6322" x2="257.6549" y1="322.5749" y2="323.4278"/>
+    <path d="M340.92,94.68 C342.53,118.26 344.52,147.44 346.13,170.92 " fill="none" id="C_0011441493064034257052&lt;-C_0004727494996070729955" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="340.02,81.53,336.438,87.7886,340.8375,93.5021,344.4194,87.2436,340.02,81.53" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="347" y="130.0664"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="357" y="137.0669">lights</text>
+    <path d="M500.42,75.07 C495.85,98.02 488.71,133.96 482.86,163.4 " fill="none" id="C_0002302554954640607720-&gt;C_0011050386686796671606" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="489.65,165.16,478.88,183.41,475.91,162.43,489.65,165.16" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M597.31,305.44 C573.3,239.5 531.32,124.27 513.45,75.2 " fill="none" id="C_0018226625421819521092&lt;-C_0002302554954640607720" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="601.86,317.93,603.5681,310.9241,597.758,306.6529,596.05,313.6588,601.86,317.93" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="586" cy="214.5664" 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="31" x="593" y="218.5669">b_int</text>
+    <path d="M676.61,238.27 C667.04,256.25 653.44,281.79 641.45,304.31 " fill="none" id="C_0004991521063183421232-&gt;C_0018226625421819521092" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="638.0064" cy="310.7768" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="641.7628" x2="634.25" y1="303.7135" y2="317.84"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="645.0696" x2="630.9432" y1="314.5332" y2="307.0204"/>
+    <path d="M658.16,75.07 C663.99,101.13 673.56,143.95 680.5,174.98 " fill="none" id="C_0012782408698292006929-&gt;C_0004991521063183421232" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="682.1057" cy="182.1725" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="680.3614" x2="683.85" y1="174.365" y2="189.98"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="689.9132" x2="674.2982" y1="180.4282" y2="183.9168"/>
+    <path d="M762.68,88.13 C747.1,114.54 726.05,150.2 710.44,176.66 " fill="none" id="C_0000654553621116797875-&gt;C_0004991521063183421232" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="706.6832" cy="183.0286" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="710.7463" x2="702.62" y1="176.1373" y2="189.92"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="713.5745" x2="699.7918" y1="187.0918" y2="178.9655"/>
+    <path d="M503.46,244.82 C521.98,262.94 546.02,286.48 567.04,307.05 " fill="none" id="C_0011050386686796671606-&gt;C_0018226625421819521092" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="572.3125" cy="312.2145" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="566.595" x2="578.03" y1="306.6189" y2="317.81"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="577.908" x2="566.7169" y1="306.4969" y2="317.932"/>
+    <path d="M755.85,242.26 C749.94,247.2 743.8,252.28 738,257 C717.12,274 693.99,292.36 673.48,308.48 " fill="none" id="C_0016299031488803029599-&gt;C_0018226625421819521092" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="667.7042" cy="313.0121" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="673.9985" x2="661.41" y1="308.0743" y2="317.95"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="672.6421" x2="662.7664" y1="319.3064" y2="306.7179"/>
+    <path d="M939.92,94.3 C951.29,119.73 965.62,151.77 976.52,176.15 " fill="none" id="C_0012576640463341047379-&gt;C_0004897065367017086369" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="979.3904" cy="182.5687" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="976.1208" x2="982.66" y1="175.2673" y2="189.87"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="986.6917" x2="972.089" y1="179.299" y2="185.8383"/>
+    <path d="M1054.68,75.07 C1042.87,101.49 1023.35,145.13 1009.43,176.25 " fill="none" id="C_0004807329861420443943-&gt;C_0004897065367017086369" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="1006.5696" cy="182.6787" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="1009.8392" x2="1003.3" y1="175.3773" y2="189.98"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="1013.871" x2="999.2683" y1="185.9483" y2="179.409"/>
  </g>
 </svg>
--- a/docs/test_cases/t00004_class_mermaid.svg
+++ b/docs/test_cases/t00004_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 1237.73828125 525" style="max-width: 1237.74px; background-color: white;" width="1237.73828125" 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 1292.50390625 716" style="max-width: 1292.5px; background-color: white;" width="1292.50390625" 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,27 +50,41 @@
    <g class="root">
      <g class="clusters"/>
      <g class="edgePaths">
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M68.875,87L68.875,96.33333333333333C68.875,105.66666666666667,68.875,124.33333333333333,68.875,139.33333333333334C68.875,154.33333333333334,68.875,165.66666666666666,68.875,171.33333333333334L68.875,177"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M212.359375,109L212.359375,114.66666666666667C212.359375,120.33333333333333,212.359375,131.66666666666666,212.359375,150.33333333333334C212.359375,169,212.359375,195,212.359375,208L212.359375,221"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M191.38858173076923,278L182.9266826923077,289.5C174.46478365384618,301,157.54098557692308,324,149.07908653846155,339.6666666666667C140.6171875,355.3333333333333,140.6171875,363.6666666666667,140.6171875,367.8333333333333L140.6171875,372"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M239.23798076923077,278L250.08373397435898,289.5C260.9294871794872,301,282.6209935897436,324,293.46674679487177,347C304.3125,370,304.3125,393,304.3125,404.5L304.3125,416"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M437.0859375,278L437.0859375,289.5C437.0859375,301,437.0859375,324,440.977390491453,345.1666666666667C444.86884348290596,366.3333333333333,452.6517494658119,385.6666666666667,456.5432024572649,395.3333333333333L460.43465544871793,405"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M504.203125,98.1446181413742L493.0169270833333,105.62051511781182C481.8307291666667,113.09641209424946,459.4583333333333,128.04820604712472,448.2721354166667,148.52410302356236C437.0859375,169,437.0859375,195,437.0859375,208L437.0859375,221"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M622.84375,68.07524586983449L700.2057291666666,80.56270489152874C777.5677083333334,93.05016391322299,932.2916666666666,118.02508195661149,1009.6536458333334,143.51254097830574C1087.015625,169,1087.015625,195,1087.015625,208L1087.015625,221"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M1056.8515625,263.19348150303733L1026.0833333333333,277.1612345858644C995.3151041666666,291.12898766869154,933.7786458333334,319.0644938343458,903.0104166666666,344.53224691717287C872.2421875,370,872.2421875,393,872.2421875,404.5L872.2421875,416"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M1110.9403245192307,278L1120.5941506410256,289.5C1130.2479767628204,301,1149.5556290064103,324,1159.209455128205,341.5C1168.86328125,359,1168.86328125,371,1168.86328125,377L1168.86328125,383"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M534.8743990384615,109L531.6596554487179,114.66666666666667C528.4449118589744,120.33333333333333,522.0154246794872,131.66666666666666,518.8006810897435,155.08333333333334C515.5859375,178.5,515.5859375,214,515.5859375,248C515.5859375,282,515.5859375,314.5,511.694484508547,340.4166666666667C507.80303151709404,366.3333333333333,500.0201255341881,385.6666666666667,496.1286725427351,395.3333333333333L492.23721955128207,405"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M592.1724759615385,109L595.3872195512821,114.66666666666667C598.6019631410256,120.33333333333333,605.0314503205128,131.66666666666666,608.2461939102565,144.83333333333334C611.4609375,158,611.4609375,173,611.4609375,180.5L611.4609375,188"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M838.6336446005918,87L829.3965267504932,96.33333333333333C820.1594089003944,105.66666666666667,801.6851732001973,124.33333333333333,792.4480553500986,139.33333333333334C783.2109375,154.33333333333334,783.2109375,165.66666666666666,783.2109375,171.33333333333334L783.2109375,177"/>
-        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M895.0460428994082,87L904.2831607495068,96.33333333333333C913.5202785996056,105.66666666666667,931.9945142998027,124.33333333333333,941.2316321499014,146.66666666666666C950.46875,169,950.46875,195,950.46875,208L950.46875,221"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M52.26500092455621,109L50.40117264546351,114.66666666666667C48.5373443663708,120.33333333333333,44.8096878081854,131.66666666666666,66.0571876540927,149.66830289267793C87.3046875,167.6699391186892,133.52734375,192.33987823737837,156.638671875,204.67484779672296L179.75,217.00981735606757"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M85.4849990754438,109L87.34882735453648,114.66666666666667C89.2126556336292,120.33333333333333,92.9403121918146,131.66666666666666,93.3253283621436,143C93.71034453247262,154.33333333333334,90.75272031494524,165.66666666666666,89.27390820618153,171.33333333333334L87.79509609741784,177"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M124.171875,81.91643991151655L148.212890625,92.09703325959713C172.25390625,102.27762660767769,220.3359375,122.63881330383884,242.8981410162363,138.4860733185861C265.4603445324726,154.33333333333334,262.50272031494524,165.66666666666666,261.02390820618155,171.33333333333334L259.54509609741785,177"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M409.45703125,109L409.45703125,114.66666666666667C409.45703125,120.33333333333333,409.45703125,131.66666666666666,409.45703125,150.33333333333334C409.45703125,169,409.45703125,195,409.45703125,208L409.45703125,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M396.03143028846154,278L390.61408253205127,289.5C385.196734775641,301,374.3620392628205,324,368.94469150641027,349.9166666666667C363.52734375,375.8333333333333,363.52734375,404.6666666666667,363.52734375,435C363.52734375,465.3333333333333,363.52734375,497.1666666666667,365.9711768877152,518.75C368.4150100254304,540.3333333333334,373.3026763008607,551.6666666666666,375.7465094385759,557.3333333333334L378.1903425762911,563"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M429.38076923076926,278L437.42017227564105,289.5C445.45957532051284,301,461.53838141025636,324,469.5777844551282,343.3333333333333C477.6171875,362.6666666666667,477.6171875,378.3333333333333,477.6171875,386.1666666666667L477.6171875,394"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M477.6171875,473L477.6171875,482.3333333333333C477.6171875,491.6666666666667,477.6171875,510.3333333333333,473.99051251956183,525.3333333333334C470.3638375391236,540.3333333333334,463.1104875782473,551.6666666666666,459.48381259780905,557.3333333333334L455.8571376173709,563"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M566.05078125,278L566.05078125,289.5C566.05078125,301,566.05078125,324,595.97265625,347.340421729807C625.89453125,370.680843459614,685.73828125,394.361686919228,715.66015625,406.202108649035L745.58203125,418.042530378842"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M710.56640625,83.09118086696562L686.48046875,93.07598405580468C662.39453125,103.06078724464373,614.22265625,123.03039362232187,590.13671875,146.01519681116093C566.05078125,169,566.05078125,195,566.05078125,208L566.05078125,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id10" d="M721.9733496671597,109L716.5969320142998,114.66666666666667C711.2205143614398,120.33333333333333,700.4676790557199,131.66666666666666,695.0912614028599,150.33333333333334C689.71484375,169,689.71484375,195,689.71484375,208L689.71484375,221"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id11" d="M676.9046875,278L671.7356770833334,289.5C666.5666666666667,301,656.2286458333333,324,650.0992548771676,345.1666666666667C643.9698639210019,366.3333333333333,642.0491028420039,385.6666666666667,641.0887223025048,395.3333333333333L640.1283417630058,405"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M707.5284855769231,278L714.7164463141025,289.5C721.9044070512822,301,736.280328525641,324,765.4090444711538,345.3580923878124C794.5377604166666,366.71618477562475,838.4192708333334,386.43236955124956,860.3600260416666,396.29046193906197L882.30078125,406.1485543268743"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id13" d="M783.8423862795858,109L785.4083687746548,114.66666666666667C786.9743512697238,120.33333333333333,790.106316259862,131.66666666666666,791.672298754931,155.08333333333334C793.23828125,178.5,793.23828125,214,793.23828125,248C793.23828125,282,793.23828125,314.5,792.4600418473025,338.5833333333333C791.6818024446051,362.6666666666667,790.12532363921,378.3333333333333,789.3470842365124,386.1666666666667L788.568844833815,394"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M829.20703125,100.5423628857873L839.19140625,107.61863573815607C849.17578125,114.69490859052486,869.14453125,128.84745429526242,879.12890625,143.4237271476312C889.11328125,158,889.11328125,173,889.11328125,180.5L889.11328125,188"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M1124.4638729659764,87L1113.863774346647,96.33333333333333C1103.2636757273176,105.66666666666667,1082.0634784886588,124.33333333333333,1071.4633798693294,139.33333333333334C1060.86328125,154.33333333333334,1060.86328125,165.66666666666666,1060.86328125,171.33333333333334L1060.86328125,177"/>
+        <path marker-start="url(#classDiagram-lollipopStart)" style="fill:none" class="edge-pattern-solid relation" id="id16" d="M1180.8762712647929,87L1188.7504083456608,96.33333333333333C1196.6245454265286,105.66666666666667,1212.3728195882643,124.33333333333333,1220.2469566691323,146.66666666666666C1228.12109375,169,1228.12109375,195,1228.12109375,208L1228.12109375,221"/>
      </g>
      <g class="edgeLabels">
-        <g transform="translate(undefined, undefined)" class="edgeLabel">
-          <g transform="translate(0, 0)" class="label">
-            <foreignObject height="0" width="0">
+        <g transform="translate(41.08203125, 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;">
                <span class="edgeLabel">
-                  <span class="edgeLabel"/>
+                  <span class="edgeLabel">+aa</span>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(96.66796875, 143)" class="edgeLabel">
+          <g transform="translate(-22.015625, -9)" class="label">
+            <foreignObject height="18" width="44.03125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel">+color</span>
                </span>
              </div>
            </foreignObject>
@@ -120,7 +134,29 @@
            </foreignObject>
          </g>
        </g>
-        <g transform="translate(437.0859375, 143)" class="edgeLabel">
+        <g transform="translate(477.6171875, 529)" class="edgeLabel">
+          <g transform="translate(-21.34375, -9)" class="label">
+            <foreignObject height="18" width="42.6875">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel">-lights</span>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(undefined, undefined)" 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">
+                  <span class="edgeLabel"/>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
+        <g transform="translate(566.05078125, 143)" class="edgeLabel">
          <g transform="translate(-22.0234375, -9)" class="label">
            <foreignObject height="18" width="44.046875">
              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
@@ -210,27 +246,71 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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"/>
-            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
+        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L4">
+          <g title="Color" id="classId-C_0008844195389762820798-0" 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"/>
+            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
+            <g class="label">
+              <foreignObject transform="translate( -53.375, -65)" height="18" width="106.75">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">«enumeration»</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -20.890625, -43)" height="18" width="41.78125" class="classTitle">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">Color</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, -9)" height="18" width="29.359375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">Red</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 13)" height="18" width="44.46875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">Green</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -53.375, 35)" height="18" width="32.03125">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">Blue</span>
+                </div>
+              </foreignObject>
+            </g>
+          </g>
+        </a>
+        <a transform="translate(68.875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L6">
+          <g title="B" id="classId-C_0009860995429872413691-1" class="node default clickable">
+            <rect height="101" width="110.59375" y="-50.5" x="-55.296875" class="outer title-state"/>
+            <line y2="-20.5" y1="-20.5" x2="55.296875" x1="-55.296875" class="divider"/>
+            <line y2="39.5" y1="39.5" x2="55.296875" x1="-55.296875" class="divider"/>
            <g class="label">
              <foreignObject height="0" width="0">
                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                  <span class="nodeLabel"/>
                </div>
              </foreignObject>
-              <foreignObject transform="translate( -5.78125, -21)" height="18" width="11.5625" class="classTitle">
+              <foreignObject transform="translate( -5.78125, -43)" height="18" width="11.5625" class="classTitle">
                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                  <span class="nodeLabel">B</span>
                </div>
              </foreignObject>
+              <foreignObject transform="translate( -47.796875, -9)" height="18" width="60.9375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">+aa : AA</span>
+                </div>
+              </foreignObject>
+              <foreignObject transform="translate( -47.796875, 13)" height="18" width="95.59375">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="font-style: italic; display: inline-block; white-space: nowrap;">
+                  <span style="font-style:italic;" class="nodeLabel">+color : Color </span>
+                </div>
+              </foreignObject>
            </g>
          </g>
        </a>
-        <a transform="translate(68.875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L6">
-          <g title="B##AA" id="classId-C_0001630205507215126623-1" class="node default clickable">
+        <a transform="translate(240.625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L8">
+          <g title="B##AA" id="classId-C_0013041644057721012989-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"/>
            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -263,8 +343,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(212.359375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L9">
-          <g title="A" id="classId-C_0001552274940876611774-2" class="node default clickable">
+        <a transform="translate(409.45703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L14">
+          <g title="A" id="classId-C_0012418199527012894198-3" 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"/>
            <line y2="-4.5" y1="-4.5" x2="80.203125" x1="-80.203125" class="divider"/>
@@ -292,8 +372,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(212.359375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L13">
-          <g title="A##AA" id="classId-C_0001742499843727859552-3" class="node default clickable">
+        <a transform="translate(409.45703125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L18">
+          <g title="A##AA" id="classId-C_0013939998749822876416-4" 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"/>
            <line y2="17.5" y1="17.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -311,8 +391,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(140.6171875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L15">
-          <g title="A##AA##Lights" id="classId-C_0000590936874508841244-4" class="node default clickable">
+        <a transform="translate(409.45703125, 635.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L20">
+          <g title="A##AA##Lights" id="classId-C_0004727494996070729955-5" 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"/>
            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -345,27 +425,32 @@
            </g>
          </g>
        </a>
-        <a transform="translate(304.3125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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"/>
-            <line y2="17.5" y1="17.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
+        <a transform="translate(477.6171875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L22">
+          <g title="A##AA##AAA" id="classId-C_0011441493064034257052-6" class="node default clickable">
+            <rect height="79" width="113.71875" y="-39.5" x="-56.859375" class="outer title-state"/>
+            <line y2="-9.5" y1="-9.5" x2="56.859375" x1="-56.859375" class="divider"/>
+            <line y2="28.5" y1="28.5" x2="56.859375" x1="-56.859375" class="divider"/>
            <g class="label">
              <foreignObject height="0" width="0">
                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                  <span class="nodeLabel"/>
                </div>
              </foreignObject>
-              <foreignObject transform="translate( -45.3203125, -21)" height="18" width="90.640625" class="classTitle">
+              <foreignObject transform="translate( -45.3203125, -32)" height="18" width="90.640625" class="classTitle">
                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
                  <span class="nodeLabel">A::AA::AAA</span>
                </div>
              </foreignObject>
+              <foreignObject transform="translate( -49.359375, 2)" height="18" width="98.71875">
+                <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                  <span class="nodeLabel">-lights : Lights</span>
+                </div>
+              </foreignObject>
            </g>
          </g>
        </a>
-        <a transform="translate(437.0859375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L33">
-          <g title="C##B" id="classId-C_0000287819369330075965-6" class="node default clickable">
+        <a transform="translate(566.05078125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L40">
+          <g title="C##B" id="classId-C_0002302554954640607720-7" 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"/>
            <line y2="17.5" y1="17.5" x2="43.5" x1="-43.5" class="divider"/>
@@ -383,8 +468,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(563.5234375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L23">
-          <g title="C" id="classId-C_0002278328177727440136-7" class="node default clickable">
+        <a transform="translate(769.88671875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L30">
+          <g title="C" id="classId-C_0018226625421819521092-8" 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"/>
            <line y2="39.5" y1="39.5" x2="59.3203125" x1="-59.3203125" class="divider"/>
@@ -412,8 +497,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1087.015625, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L27">
-          <g title="C##AA" id="classId-C_0000623940132897927654-8" class="node default clickable">
+        <a transform="translate(689.71484375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L34">
+          <g title="C##AA" id="classId-C_0004991521063183421232-9" 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"/>
            <line y2="17.5" y1="17.5" x2="30.1640625" x1="-30.1640625" class="divider"/>
@@ -431,8 +516,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(872.2421875, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L28">
-          <g title="C##AA##AAA" id="classId-C_0001597801087286500866-9" class="node default clickable">
+        <a transform="translate(637.296875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L35">
+          <g title="C##AA##AAA" id="classId-C_0012782408698292006929-10" 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"/>
            <line y2="17.5" y1="17.5" x2="52.8203125" x1="-52.8203125" class="divider"/>
@@ -450,8 +535,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1168.86328125, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L30">
-          <g title="C##AA##CCC" id="classId-C_0000081819202639599734-10" class="node default clickable">
+        <a transform="translate(943.17578125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L37">
+          <g title="C##AA##CCC" id="classId-C_0000654553621116797875-11" 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"/>
            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -479,8 +564,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(476.3359375, 444.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L33">
-          <g title="C##B" id="classId-C_0001381298335849583950-11" class="node default clickable">
+        <a transform="translate(784.64453125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L40">
+          <g title="C##B" id="classId-C_0011050386686796671606-12" 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"/>
            <line y2="28.5" y1="28.5" x2="39.0625" x1="-39.0625" class="divider"/>
@@ -503,8 +588,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(611.4609375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L39">
-          <g title="C##CC" id="classId-C_0002037378936100378699-12" class="node default clickable">
+        <a transform="translate(889.11328125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L46">
+          <g title="C##CC" id="classId-C_0016299031488803029599-13" 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"/>
            <line y2="50.5" y1="50.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -532,8 +617,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(866.83984375, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L43">
-          <g title="D" id="classId-C_0000612133170877135796-13" class="node default clickable">
+        <a transform="translate(1156.83203125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L50">
+          <g title="D" id="classId-C_0004897065367017086369-14" 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"/>
            <line y2="17.5" y1="17.5" x2="39.5" x1="-39.5" class="divider"/>
@@ -551,8 +636,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(783.2109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L45">
-          <g title="D##AA" id="classId-C_0001572080057917630922-14" class="node default clickable">
+        <a transform="translate(1060.86328125, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L52">
+          <g title="D##AA" id="classId-C_0012576640463341047379-15" 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"/>
            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -585,8 +670,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(950.46875, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00004/t00004.cc#L47">
-          <g title="D##DD" id="classId-C_0000600916232677555492-15" class="node default clickable">
+        <a transform="translate(1228.12109375, 249.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00004/t00004.cc#L54">
+          <g title="D##DD" id="classId-C_0004807329861420443943-16" 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"/>
            <line y2="17.5" y1="17.5" x2="56.3828125" x1="-56.3828125" class="divider"/>
--- a/docs/test_cases/t00005.md
+++ b/docs/test_cases/t00005.md
@@ -73,7 +73,7 @@ public:
    {
      "bases": [],
      "display_name": "A",
-      "id": "96355893895780319",
+      "id": "770847151166242555",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -95,7 +95,7 @@ public:
    {
      "bases": [],
      "display_name": "B",
-      "id": "1909425857334087541",
+      "id": "15275406858672700331",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -117,7 +117,7 @@ public:
    {
      "bases": [],
      "display_name": "C",
-      "id": "968176384460064907",
+      "id": "7745411075680519262",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -139,7 +139,7 @@ public:
    {
      "bases": [],
      "display_name": "D",
-      "id": "1735599590836186693",
+      "id": "13884796726689493544",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -161,7 +161,7 @@ public:
    {
      "bases": [],
      "display_name": "E",
-      "id": "887960136921844658",
+      "id": "7103681095374757269",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -183,7 +183,7 @@ public:
    {
      "bases": [],
      "display_name": "F",
-      "id": "772719357856231772",
+      "id": "6181754862849854182",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -205,7 +205,7 @@ public:
    {
      "bases": [],
      "display_name": "G",
-      "id": "979147885884736437",
+      "id": "7833183087077891503",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -227,7 +227,7 @@ public:
    {
      "bases": [],
      "display_name": "H",
-      "id": "1440673301054236675",
+      "id": "11525386408433893405",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -249,7 +249,7 @@ public:
    {
      "bases": [],
      "display_name": "I",
-      "id": "109681731550086430",
+      "id": "877453852400691446",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -271,7 +271,7 @@ public:
    {
      "bases": [],
      "display_name": "J",
-      "id": "338330011969650325",
+      "id": "2706640095757202600",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -293,7 +293,7 @@ public:
    {
      "bases": [],
      "display_name": "K",
-      "id": "2179119389830432509",
+      "id": "17432955118643460073",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -315,7 +315,7 @@ public:
    {
      "bases": [],
      "display_name": "R",
-      "id": "630692407373144211",
+      "id": "5045539258985153690",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -521,79 +521,79 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "96355893895780319",
+      "destination": "770847151166242555",
      "label": "a",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1909425857334087541",
+      "destination": "15275406858672700331",
      "label": "b",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "968176384460064907",
+      "destination": "7745411075680519262",
      "label": "c",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "1735599590836186693",
+      "destination": "13884796726689493544",
      "label": "d",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "887960136921844658",
+      "destination": "7103681095374757269",
      "label": "e",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "772719357856231772",
+      "destination": "6181754862849854182",
      "label": "f",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "979147885884736437",
+      "destination": "7833183087077891503",
      "label": "g",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "1440673301054236675",
+      "destination": "11525386408433893405",
      "label": "h",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "109681731550086430",
+      "destination": "877453852400691446",
      "label": "i",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "338330011969650325",
+      "destination": "2706640095757202600",
      "label": "j",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "2179119389830432509",
+      "destination": "17432955118643460073",
      "label": "k",
-      "source": "630692407373144211",
+      "source": "5045539258985153690",
      "type": "association"
    }
  ],
--- 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="fz0oabt4qd0j8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fht7ubjwrzh8p" 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,238 +9,238 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0000770847151166242555" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0015275406858672700331" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0007745411075680519262" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0013884796726689493544" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0007103681095374757269" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0006181754862849854182" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0007833183087077891503" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0011525386408433893405" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0000877453852400691446" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0002706640095757202600" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="48" id="C_0017432955118643460073" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fz0oabt4qd0j8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fht7ubjwrzh8p)" height="240.0703" id="C_0005045539258985153690" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <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_0005045539258985153690&lt;-C_0000770847151166242555" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="296.8,189.02,289.6065,188.517,286.3754,194.9637,293.5689,195.4667,296.8,189.02" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="139" y="291.0669">+a</text>
-    <path d="M296.95,205.9 C235.22,250.67 162.45,303.44 125.38,330.32 " fill="none" id="C_0000630692407373144211-&gt;C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M296.95,205.9 C235.22,250.67 162.45,303.44 125.38,330.32 " fill="none" id="C_0005045539258985153690-&gt;C_0015275406858672700331" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="121.04,333.47,130.6752,331.4296,125.0892,330.5368,125.9821,324.9509,121.04,333.47" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="192" y="291.0669">+b</text>
-    <path d="M296.81,231.45 C260.45,266.53 223.08,302.58 199.72,325.12 " fill="none" id="C_0000630692407373144211-&gt;C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M296.81,231.45 C260.45,266.53 223.08,302.58 199.72,325.12 " fill="none" id="C_0005045539258985153690-&gt;C_0007745411075680519262" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="196.09,328.62,205.3384,325.2338,199.6823,325.1422,199.7739,319.4861,196.09,328.62" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="245" y="291.0669">+c</text>
-    <path d="M320.87,248.11 C302.09,275.35 283.87,301.78 270.89,320.61 " fill="none" id="C_0000630692407373144211-&gt;C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M320.87,248.11 C302.09,275.35 283.87,301.78 270.89,320.61 " fill="none" id="C_0005045539258985153690-&gt;C_0013884796726689493544" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="268.03,324.75,276.4249,319.5997,270.8626,320.6298,269.8326,315.0675,268.03,324.75" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="298" y="291.0669">+d</text>
-    <path d="M362.21,248.11 C353.04,274.89 344.13,300.89 337.71,319.65 " fill="none" id="C_0000630692407373144211-&gt;C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M362.21,248.11 C353.04,274.89 344.13,300.89 337.71,319.65 " fill="none" id="C_0005045539258985153690-&gt;C_0007103681095374757269" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="335.96,324.75,342.6532,317.525,337.5754,320.0181,335.0822,314.9403,335.96,324.75" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="352" y="291.0669">+e</text>
-    <path d="M403,261.41 C403,285.83 403,308.67 403,324.75 " fill="none" id="C_0000630692407373144211&lt;-C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M403,261.41 C403,285.83 403,308.67 403,324.75 " fill="none" id="C_0005045539258985153690&lt;-C_0006181754862849854182" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="403,248.11,399,254.11,403,260.11,407,254.11,403,248.11" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="404" y="291.0669">+f</text>
-    <path d="M443.79,248.11 C452.96,274.89 461.87,300.89 468.29,319.65 " fill="none" id="C_0000630692407373144211-&gt;C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M443.79,248.11 C452.96,274.89 461.87,300.89 468.29,319.65 " fill="none" id="C_0005045539258985153690-&gt;C_0007833183087077891503" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="470.04,324.75,470.9178,314.9403,468.4246,320.0181,463.3468,317.525,470.04,324.75" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="459" y="291.0669">+g</text>
-    <path d="M485.13,248.11 C503.91,275.35 522.13,301.78 535.11,320.61 " fill="none" id="C_0000630692407373144211-&gt;C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M485.13,248.11 C503.91,275.35 522.13,301.78 535.11,320.61 " fill="none" id="C_0005045539258985153690-&gt;C_0011525386408433893405" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="537.97,324.75,536.1674,315.0675,535.1374,320.6298,529.5751,319.5997,537.97,324.75" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="515" y="291.0669">+h</text>
-    <path d="M509.1,232.73 C545.65,268.47 583.05,305.04 605.66,327.13 " fill="none" id="C_0000630692407373144211-&gt;C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M509.1,232.73 C545.65,268.47 583.05,305.04 605.66,327.13 " fill="none" id="C_0005045539258985153690-&gt;C_0000877453852400691446" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="609.43,330.82,605.7835,321.671,605.852,327.3275,600.1955,327.3959,609.43,330.82" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="568" y="291.0669">+i</text>
-    <path d="M509.14,208.06 C569.83,253.27 640.62,306 675.43,331.93 " fill="none" id="C_0000630692407373144211-&gt;C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M509.14,208.06 C569.83,253.27 640.62,306 675.43,331.93 " fill="none" id="C_0005045539258985153690-&gt;C_0002706640095757202600" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="679.49,334.96,674.69,326.36,675.49,331.96,669.89,332.76,679.49,334.96" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="620" y="291.0669">+j</text>
-    <path d="M509.24,191.61 C573.84,229.84 657.88,279.89 732,325 C736.26,327.6 740.79,330.38 745.16,333.09 " fill="none" id="C_0000630692407373144211-&gt;C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M509.24,191.61 C573.84,229.84 657.88,279.89 732,325 C736.26,327.6 740.79,330.38 745.16,333.09 " fill="none" id="C_0005045539258985153690-&gt;C_0017432955118643460073" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="749.46,335.76,743.9036,327.6282,745.2056,333.1331,739.7007,334.4352,749.46,335.76" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="680" y="291.0669">+k</text>
  </g>
--- a/docs/test_cases/t00005_class_mermaid.svg
+++ b/docs/test_cases/t00005_class_mermaid.svg
@@ -186,8 +186,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L3">
-          <g title="A" id="classId-C_0000096355893895780319-0" class="node default clickable">
+        <a transform="translate(21.28125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L3">
+          <g title="A" id="classId-C_0000770847151166242555-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,8 +205,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L5">
-          <g title="B" id="classId-C_0001909425857334087541-1" class="node default clickable">
+        <a transform="translate(97.84375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L5">
+          <g title="B" id="classId-C_0015275406858672700331-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,8 +224,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L7">
-          <g title="C" id="classId-C_0000968176384460064907-2" class="node default clickable">
+        <a transform="translate(174.40625, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L7">
+          <g title="C" id="classId-C_0007745411075680519262-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,8 +243,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L9">
-          <g title="D" id="classId-C_0001735599590836186693-3" class="node default clickable">
+        <a transform="translate(250.96875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L9">
+          <g title="D" id="classId-C_0013884796726689493544-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,8 +262,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L11">
-          <g title="E" id="classId-C_0000887960136921844658-4" class="node default clickable">
+        <a transform="translate(327.0859375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L11">
+          <g title="E" id="classId-C_0007103681095374757269-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"/>
            <line y2="17.5" y1="17.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,8 +281,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L13">
-          <g title="F" id="classId-C_0000772719357856231772-5" class="node default clickable">
+        <a transform="translate(402.3125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L13">
+          <g title="F" id="classId-C_0006181754862849854182-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"/>
            <line y2="17.5" y1="17.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,8 +300,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L15">
-          <g title="G" id="classId-C_0000979147885884736437-6" class="node default clickable">
+        <a transform="translate(478.4296875, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L15">
+          <g title="G" id="classId-C_0007833183087077891503-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"/>
            <line y2="17.5" y1="17.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,8 +319,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L17">
-          <g title="H" id="classId-C_0001440673301054236675-7" class="node default clickable">
+        <a transform="translate(555.4375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L17">
+          <g title="H" id="classId-C_0011525386408433893405-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,8 +338,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L19">
-          <g title="I" id="classId-C_0000109681731550086430-8" class="node default clickable">
+        <a transform="translate(628.4453125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L19">
+          <g title="I" id="classId-C_0000877453852400691446-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"/>
            <line y2="17.5" y1="17.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,8 +357,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L21">
-          <g title="J" id="classId-C_0000338330011969650325-9" class="node default clickable">
+        <a transform="translate(700.125, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L21">
+          <g title="J" id="classId-C_0002706640095757202600-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"/>
            <line y2="17.5" y1="17.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,8 +376,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L23">
-          <g title="K" id="classId-C_0002179119389830432509-10" class="node default clickable">
+        <a transform="translate(775.359375, 491.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L23">
+          <g title="K" id="classId-C_0017432955118643460073-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,8 +395,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00005/t00005.cc#L25">
-          <g title="R" id="classId-C_0000630692407373144211-11" class="node default clickable">
+        <a transform="translate(402.3125, 201.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00005/t00005.cc#L25">
+          <g title="R" id="classId-C_0005045539258985153690-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"/>
            <line y2="182.5" y1="182.5" x2="122.90625" x1="-122.90625" class="divider"/>
--- a/docs/test_cases/t00006.md
+++ b/docs/test_cases/t00006.md
@@ -97,7 +97,7 @@ public:
    {
      "bases": [],
      "display_name": "A",
-      "id": "989095304444672400",
+      "id": "7912762435557379205",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -119,7 +119,7 @@ public:
    {
      "bases": [],
      "display_name": "B",
-      "id": "648285260245005311",
+      "id": "5186282081960042491",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -141,7 +141,7 @@ public:
    {
      "bases": [],
      "display_name": "C",
-      "id": "323304333007297774",
+      "id": "2586434664058382197",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -163,7 +163,7 @@ public:
    {
      "bases": [],
      "display_name": "D",
-      "id": "1006912399043633492",
+      "id": "8055299192349067940",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -185,7 +185,7 @@ public:
    {
      "bases": [],
      "display_name": "E",
-      "id": "1092550394020578978",
+      "id": "8740403152164631827",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -207,7 +207,7 @@ public:
    {
      "bases": [],
      "display_name": "F",
-      "id": "965398761810782236",
+      "id": "7723190094486257891",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -229,7 +229,7 @@ public:
    {
      "bases": [],
      "display_name": "G",
-      "id": "1764732000887030464",
+      "id": "14117856007096243716",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -251,7 +251,7 @@ public:
    {
      "bases": [],
      "display_name": "H",
-      "id": "1669285599837552146",
+      "id": "13354284798700417170",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -273,7 +273,7 @@ public:
    {
      "bases": [],
      "display_name": "I",
-      "id": "2234750598599000377",
+      "id": "17878004788792003021",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -295,7 +295,7 @@ public:
    {
      "bases": [],
      "display_name": "J",
-      "id": "1335933649375465369",
+      "id": "10687469195003722956",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -317,7 +317,7 @@ public:
    {
      "bases": [],
      "display_name": "K",
-      "id": "1603190364864080123",
+      "id": "12825522918912640984",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -339,7 +339,7 @@ public:
    {
      "bases": [],
      "display_name": "L",
-      "id": "305487238408320046",
+      "id": "2443897907266560370",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -361,7 +361,7 @@ public:
    {
      "bases": [],
      "display_name": "M",
-      "id": "1664744512423723275",
+      "id": "13317956099389786204",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -383,7 +383,7 @@ public:
    {
      "bases": [],
      "display_name": "N",
-      "id": "950210019792152600",
+      "id": "7601680158337220805",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -405,7 +405,7 @@ public:
    {
      "bases": [],
      "display_name": "NN",
-      "id": "1662349735899726224",
+      "id": "13298797887197809793",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -427,7 +427,7 @@ public:
    {
      "bases": [],
      "display_name": "NNN",
-      "id": "1963145075481599858",
+      "id": "15705160603852798870",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -449,7 +449,7 @@ public:
    {
      "bases": [],
      "display_name": "custom_container<T>",
-      "id": "916380191954937631",
+      "id": "7331041535639501055",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -491,7 +491,7 @@ public:
    {
      "bases": [],
      "display_name": "custom_container<E>",
-      "id": "50153113082434858",
+      "id": "401224904659478871",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -512,7 +512,7 @@ public:
          "is_variadic": false,
          "kind": "argument",
          "template_parameters": [],
-          "type": "clanguml::t00006::E"
+          "type": "E"
        }
      ],
      "type": "class"
@@ -520,7 +520,7 @@ public:
    {
      "bases": [],
      "display_name": "R",
-      "id": "303025561016882526",
+      "id": "2424204488135060211",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -702,126 +702,135 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "1092550394020578978",
-      "source": "50153113082434858",
+      "destination": "8740403152164631827",
+      "source": "401224904659478871",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "916380191954937631",
-      "source": "50153113082434858",
+      "destination": "7331041535639501055",
+      "source": "401224904659478871",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "989095304444672400",
+      "destination": "7912762435557379205",
      "label": "a",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "648285260245005311",
+      "destination": "5186282081960042491",
      "label": "b",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "323304333007297774",
+      "destination": "2586434664058382197",
      "label": "c",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1006912399043633492",
+      "destination": "8055299192349067940",
      "label": "d",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "50153113082434858",
+      "destination": "401224904659478871",
      "label": "e",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "965398761810782236",
+      "destination": "7723190094486257891",
      "label": "f",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1764732000887030464",
+      "destination": "14117856007096243716",
      "label": "g",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "1669285599837552146",
+      "destination": "13354284798700417170",
      "label": "h",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "2234750598599000377",
+      "destination": "13354284798700417170",
+      "label": "h",
+      "source": "2424204488135060211",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "17878004788792003021",
      "label": "i",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "1335933649375465369",
+      "destination": "10687469195003722956",
      "label": "j",
-      "source": "303025561016882526",
+      "multiplicity_destination": "10",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1603190364864080123",
+      "destination": "12825522918912640984",
      "label": "k",
-      "source": "303025561016882526",
+      "multiplicity_destination": "20",
+      "source": "2424204488135060211",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "305487238408320046",
+      "destination": "2443897907266560370",
      "label": "lm",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1664744512423723275",
+      "destination": "13317956099389786204",
      "label": "lm",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "950210019792152600",
+      "destination": "7601680158337220805",
      "label": "ns",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1662349735899726224",
+      "destination": "13298797887197809793",
      "label": "ns",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1963145075481599858",
+      "destination": "15705160603852798870",
      "label": "ns",
-      "source": "303025561016882526",
+      "source": "2424204488135060211",
      "type": "aggregation"
    }
  ],
--- 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="ftslzb492pqzp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1rfda7fskjn3q" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0007912762435557379205" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0005186282081960042491" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0002586434664058382197" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0008055299192349067940" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0008740403152164631827" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0007723190094486257891" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0014117856007096243716" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0013354284798700417170" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0017878004788792003021" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0010687469195003722956" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0012825522918912640984" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0002443897907266560370" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0013317956099389786204" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0007601680158337220805" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0013298797887197809793" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0015705160603852798870" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="60.8047" id="C_0007331041535639501055" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="48" id="C_0000401224904659478871" 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,159 +164,161 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftslzb492pqzp)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rfda7fskjn3q)" height="214.4609" id="C_0002424204488135060211" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M1219.28,347.24 C1208.62,365.3 1193.8,390.41 1182.5,409.56 " fill="none" id="C_0000401224904659478871-&gt;C_0008740403152164631827" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="1179.7,414.29,1187.7242,408.5793,1182.2451,409.9862,1180.8381,404.5071,1179.7,414.29" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1246.52,347.24 C1253.75,359.69 1262.94,375.49 1271.6,390.38 " fill="none" id="C_0000050153113082434858-&gt;C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M1246.52,347.24 C1253.75,359.69 1262.94,375.49 1271.6,390.38 " fill="none" id="C_0000401224904659478871-&gt;C_0007331041535639501055" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="1277.73,387,1281.73,407.81,1265.63,394.03,1277.73,387" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M458.29,155.44 C376.7,181.33 268.96,216.8 175,252 C124.45,270.94 110.96,274.23 63,299 C57.36,301.92 51.43,305.39 46.02,308.75 " fill="none" id="C_0000303025561016882526&lt;-C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M458.29,155.44 C376.7,181.33 268.96,216.8 175,252 C124.45,270.94 110.96,274.23 63,299 C57.36,301.92 51.43,305.39 46.02,308.75 " fill="none" id="C_0002424204488135060211&lt;-C_0007912762435557379205" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="470.89,151.45,463.9642,149.4417,459.4466,155.0623,466.3724,157.0706,470.89,151.45" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="176" y="265.0669">+a</text>
-    <path d="M470.77,160.82 C404.5,186.88 319.81,220.66 245,252 C197.09,272.07 183.95,274.78 138,299 C133.87,301.18 129.59,303.64 125.46,306.12 " fill="none" id="C_0000303025561016882526-&gt;C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M470.77,160.82 C404.5,186.88 319.81,220.66 245,252 C197.09,272.07 183.95,274.78 138,299 C133.87,301.18 129.59,303.64 125.46,306.12 " fill="none" id="C_0002424204488135060211-&gt;C_0005186282081960042491" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="121.05,308.82,130.8145,307.5335,125.3146,306.2099,126.6383,300.71,121.05,308.82" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="246" y="265.0669">+b</text>
-    <path d="M458.79,175.2 C386.27,209.78 294.14,255.14 214,299 C208.18,302.18 201.98,305.82 196.32,309.25 " fill="none" id="C_0000303025561016882526&lt;-C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M458.79,175.2 C386.27,209.78 294.14,255.14 214,299 C208.18,302.18 201.98,305.82 196.32,309.25 " fill="none" id="C_0002424204488135060211&lt;-C_0002586434664058382197" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="470.71,169.52,463.5735,168.4851,459.8735,174.6746,467.0099,175.7095,470.71,169.52" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="296" y="265.0669">+c</text>
-    <path d="M470.59,187.18 C400.73,230.27 317.51,281.59 276.85,306.67 " fill="none" id="C_0000303025561016882526-&gt;C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M470.59,187.18 C400.73,230.27 317.51,281.59 276.85,306.67 " fill="none" id="C_0002424204488135060211-&gt;C_0008055299192349067940" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="272.58,309.31,282.3425,308.0089,276.8407,306.6935,278.1561,301.1917,272.58,309.31" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="362" y="265.0669">+d</text>
-    <path d="M713.81,155.54 C800.34,182.44 917.17,218.99 1020,252 C1068,267.41 1121.94,285.14 1163.53,298.9 " fill="none" id="C_0000303025561016882526&lt;-C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M713.81,155.54 C800.34,182.44 917.17,218.99 1020,252 C1068,267.41 1121.94,285.14 1163.53,298.9 " fill="none" id="C_0002424204488135060211&lt;-C_0000401224904659478871" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="701.27,151.65,705.813,157.2501,712.7296,155.2105,708.1866,149.6104,701.27,151.65" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="1068" y="265.0669">+e</text>
-    <path d="M460.61,215.73 C416.52,250.8 371.79,286.38 346.9,306.17 " fill="none" id="C_0000303025561016882526&lt;-C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M460.61,215.73 C416.52,250.8 371.79,286.38 346.9,306.17 " fill="none" id="C_0002424204488135060211&lt;-C_0007723190094486257891" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="470.89,207.55,463.7046,208.1587,461.5029,215.0254,468.6882,214.4168,470.89,207.55" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="412" y="265.0669">+f</text>
-    <path d="M491.31,222.02 C467.24,248.96 443.42,275.63 426.44,294.64 " fill="none" id="C_0000303025561016882526-&gt;C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M491.31,222.02 C467.24,248.96 443.42,275.63 426.44,294.64 " fill="none" id="C_0002424204488135060211-&gt;C_0014117856007096243716" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="422.7,298.82,431.6776,294.7699,426.0298,295.0901,425.7097,289.4423,422.7,298.82" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="463" y="265.0669">+g</text>
-    <path d="M524.21,233.86 C511.21,258.66 498.82,282.28 490.15,298.82 " fill="none" id="C_0000303025561016882526&lt;-C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M524.21,233.86 C511.21,258.66 498.82,282.28 490.15,298.82 " fill="none" id="C_0002424204488135060211&lt;-C_0013354284798700417170" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="530.42,222.02,524.0933,225.4801,524.8539,232.651,531.1806,229.1909,530.42,222.02" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="514" y="265.0669">+h</text>
-    <path d="M567.07,222.13 C565.33,232.23 563.62,242.3 562,252 C559.7,265.82 557.26,281.2 555.28,294.01 " fill="none" id="C_0000303025561016882526-&gt;C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M567.07,222.13 C565.33,232.23 563.62,242.3 562,252 C559.7,265.82 557.26,281.2 555.28,294.01 " fill="none" id="C_0002424204488135060211-&gt;C_0017878004788792003021" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="554.51,298.97,559.8266,290.6794,555.2671,294.0276,551.9188,289.4681,554.51,298.97" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="563" y="265.0669">+i</text>
-    <path d="M606.2,234.87 C610.35,259.3 614.29,282.51 617.06,298.82 " fill="none" id="C_0000303025561016882526&lt;-C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M606.2,234.87 C610.35,259.3 614.29,282.51 617.06,298.82 " fill="none" id="C_0002424204488135060211&lt;-C_0010687469195003722956" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="604.01,222.02,601.0746,228.6066,606.0255,233.8495,608.9609,227.2629,604.01,222.02" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="14" x="613" y="265.0669">+j</text>
-    <path d="M641.07,222.02 C654.95,248.74 668.68,275.18 678.54,294.16 " fill="none" id="C_0000303025561016882526-&gt;C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="598.0004" y="287.7859">10</text>
+    <path d="M641.07,222.02 C654.95,248.74 668.68,275.18 678.54,294.16 " fill="none" id="C_0002424204488135060211-&gt;C_0012825522918912640984" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="680.96,298.82,680.3746,288.9886,678.6613,294.3797,673.2702,292.6664,680.96,298.82" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="666" y="265.0669">+k</text>
-    <path d="M688.02,232.11 C711.05,258.33 733.08,283.39 747.99,300.36 " fill="none" id="C_0000303025561016882526&lt;-C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="659.8248" y="287.7859">20</text>
+    <path d="M688.02,232.11 C711.05,258.33 733.08,283.39 747.99,300.36 " fill="none" id="C_0002424204488135060211&lt;-C_0002443897907266560370" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="679.15,222.02,680.1055,229.1675,687.0707,231.0346,686.1152,223.8871,679.15,222.02" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="725" cy="261.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="16" x="732" y="265.0669">lm</text>
-    <path d="M711.74,215.61 C727.02,227.83 742.39,240.17 757,252 C778.84,269.68 803.63,290.14 820.77,304.35 " fill="none" id="C_0000303025561016882526&lt;-C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M711.74,215.61 C727.02,227.83 742.39,240.17 757,252 C778.84,269.68 803.63,290.14 820.77,304.35 " fill="none" id="C_0002424204488135060211&lt;-C_0013317956099389786204" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="701.19,207.18,703.3811,214.0501,710.5656,214.6699,708.3744,207.7998,701.19,207.18" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="782" cy="261.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="16" x="789" y="265.0669">lm</text>
-    <path d="M712.39,189.86 C745.64,209.71 781.34,231.39 814,252 C843.65,270.71 877.25,293.37 898.28,307.74 " fill="none" id="C_0000303025561016882526&lt;-C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M712.39,189.86 C745.64,209.71 781.34,231.39 814,252 C843.65,270.71 877.25,293.37 898.28,307.74 " fill="none" id="C_0002424204488135060211&lt;-C_0007601680158337220805" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="701.21,183.2,704.3166,189.7076,711.5185,189.3429,708.4119,182.8353,701.21,183.2" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="847" cy="261.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="15" x="854" y="265.0669">ns</text>
-    <path d="M713.07,172.33 C764.72,195.97 824.69,224.35 878,252 C912.03,269.65 950.21,291.98 974.65,306.61 " fill="none" id="C_0000303025561016882526&lt;-C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M713.07,172.33 C764.72,195.97 824.69,224.35 878,252 C912.03,269.65 950.21,291.98 974.65,306.61 " fill="none" id="C_0002424204488135060211&lt;-C_0013298797887197809793" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="701.15,166.9,704.947,173.0305,712.0663,171.8835,708.2693,165.753,701.15,166.9" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="915" cy="261.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="15" x="922" y="265.0669">ns</text>
-    <path d="M713.66,161.01 C783,186.26 869.88,219.2 946,252 C986.21,269.32 1031.45,291.83 1060.31,306.58 " fill="none" id="C_0000303025561016882526&lt;-C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M713.66,161.01 C783,186.26 869.88,219.2 946,252 C986.21,269.32 1031.45,291.83 1060.31,306.58 " fill="none" id="C_0002424204488135060211&lt;-C_0015705160603852798870" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="701.37,156.54,705.6494,162.344,712.6529,160.6261,708.3735,154.8221,701.37,156.54" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="989" cy="261.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="15" x="996" y="265.0669">ns</text>
--- a/docs/test_cases/t00006_class_mermaid.svg
+++ b/docs/test_cases/t00006_class_mermaid.svg
@@ -202,6 +202,14 @@
            </foreignObject>
          </g>
        </g>
+        <g transform="translate(634.3670392320046, 396.4337717562932)" class="edgeTerminals">
+          <g transform="translate(0, 0)" class="inner"/>
+          <foreignObject style="width: 18px; height: 12px;">
+            <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+              <span class="edgeLabel">10</span>
+            </div>
+          </foreignObject>
+        </g>
        <g transform="translate(699.6875, 385)" class="edgeLabel">
          <g transform="translate(-8.671875, -9)" class="label">
            <foreignObject height="18" width="17.34375">
@@ -213,6 +221,14 @@
            </foreignObject>
          </g>
        </g>
+        <g transform="translate(709.4483592266314, 396.3556735882021)" class="edgeTerminals">
+          <g transform="translate(0, 0)" class="inner"/>
+          <foreignObject style="width: 18px; height: 12px;">
+            <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+              <span class="edgeLabel">20</span>
+            </div>
+          </foreignObject>
+        </g>
        <g transform="translate(775.359375, 385)" class="edgeLabel">
          <g transform="translate(-13.1171875, -9)" class="label">
            <foreignObject height="18" width="26.234375">
@@ -270,8 +286,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L7">
-          <g title="A" id="classId-C_0000989095304444672400-0" class="node default clickable">
+        <a transform="translate(21.28125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L7">
+          <g title="A" id="classId-C_0007912762435557379205-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -289,8 +305,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L9">
-          <g title="B" id="classId-C_0000648285260245005311-1" class="node default clickable">
+        <a transform="translate(97.84375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L9">
+          <g title="B" id="classId-C_0005186282081960042491-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -308,8 +324,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L11">
-          <g title="C" id="classId-C_0000323304333007297774-2" class="node default clickable">
+        <a transform="translate(174.40625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L11">
+          <g title="C" id="classId-C_0002586434664058382197-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -327,8 +343,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L13">
-          <g title="D" id="classId-C_0001006912399043633492-3" class="node default clickable">
+        <a transform="translate(250.96875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L13">
+          <g title="D" id="classId-C_0008055299192349067940-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -346,8 +362,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L15">
-          <g title="E" id="classId-C_0001092550394020578978-4" class="node default clickable">
+        <a transform="translate(1194.76953125, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L15">
+          <g title="E" id="classId-C_0008740403152164631827-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"/>
            <line y2="17.5" y1="17.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -365,8 +381,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L17">
-          <g title="F" id="classId-C_0000965398761810782236-5" class="node default clickable">
+        <a transform="translate(326.640625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L17">
+          <g title="F" id="classId-C_0007723190094486257891-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"/>
            <line y2="17.5" y1="17.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -384,8 +400,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L19">
-          <g title="G" id="classId-C_0001764732000887030464-6" class="node default clickable">
+        <a transform="translate(402.7578125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L19">
+          <g title="G" id="classId-C_0014117856007096243716-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"/>
            <line y2="17.5" y1="17.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -403,8 +419,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L21">
-          <g title="H" id="classId-C_0001669285599837552146-7" class="node default clickable">
+        <a transform="translate(479.765625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L21">
+          <g title="H" id="classId-C_0013354284798700417170-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -422,8 +438,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L23">
-          <g title="I" id="classId-C_0002234750598599000377-8" class="node default clickable">
+        <a transform="translate(552.7734375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L23">
+          <g title="I" id="classId-C_0017878004788792003021-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"/>
            <line y2="17.5" y1="17.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -441,8 +457,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L25">
-          <g title="J" id="classId-C_0001335933649375465369-9" class="node default clickable">
+        <a transform="translate(624.453125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L25">
+          <g title="J" id="classId-C_0010687469195003722956-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"/>
            <line y2="17.5" y1="17.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -460,8 +476,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L27">
-          <g title="K" id="classId-C_0001603190364864080123-10" class="node default clickable">
+        <a transform="translate(699.6875, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L27">
+          <g title="K" id="classId-C_0012825522918912640984-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -479,8 +495,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L29">
-          <g title="L" id="classId-C_0000305487238408320046-11" class="node default clickable">
+        <a transform="translate(775.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L29">
+          <g title="L" id="classId-C_0002443897907266560370-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"/>
            <line y2="17.5" y1="17.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -498,8 +514,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L31">
-          <g title="M" id="classId-C_0001664744512423723275-12" class="node default clickable">
+        <a transform="translate(851.9140625, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L31">
+          <g title="M" id="classId-C_0013317956099389786204-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"/>
            <line y2="17.5" y1="17.5" x2="14.1640625" x1="-14.1640625" class="divider"/>
@@ -517,8 +533,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L33">
-          <g title="N" id="classId-C_0000950210019792152600-13" class="node default clickable">
+        <a transform="translate(929.359375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L33">
+          <g title="N" id="classId-C_0007601680158337220805-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -536,8 +552,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L35">
-          <g title="NN" id="classId-C_0001662349735899726224-14" class="node default clickable">
+        <a transform="translate(1011.6953125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L35">
+          <g title="NN" id="classId-C_0013298797887197809793-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"/>
            <line y2="17.5" y1="17.5" x2="19.0546875" x1="-19.0546875" class="divider"/>
@@ -555,8 +571,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L37">
-          <g title="NNN" id="classId-C_0001963145075481599858-15" class="node default clickable">
+        <a transform="translate(1105.5859375, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L37">
+          <g title="NNN" id="classId-C_0015705160603852798870-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"/>
            <line y2="17.5" y1="17.5" x2="24.8359375" x1="-24.8359375" class="divider"/>
@@ -574,8 +590,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L39">
-          <g title="custom_container" id="classId-C_0000916380191954937631-16" class="node default clickable">
+        <a transform="translate(1348.24609375, 565.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L39">
+          <g title="custom_container" id="classId-C_0007331041535639501055-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"/>
            <line y2="28.5" y1="28.5" x2="90.640625" x1="-90.640625" class="divider"/>
@@ -598,8 +614,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L39">
-          <g title="custom_container" id="classId-C_0000050153113082434858-17" class="node default clickable">
+        <a transform="translate(1271.5078125, 447.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L39">
+          <g title="custom_container" id="classId-C_0000401224904659478871-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"/>
            <line y2="17.5" y1="17.5" x2="91.0859375" x1="-91.0859375" class="divider"/>
@@ -617,8 +633,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00006/t00006.cc#L44">
-          <g title="R" id="classId-C_0000303025561016882526-18" class="node default clickable">
+        <a transform="translate(588.61328125, 179.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00006/t00006.cc#L44">
+          <g title="R" id="classId-C_0002424204488135060211-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"/>
            <line y2="160.5" y1="160.5" x2="131.7890625" x1="-131.7890625" class="divider"/>
--- a/docs/test_cases/t00007.md
+++ b/docs/test_cases/t00007.md
@@ -47,7 +47,7 @@ public:
    {
      "bases": [],
      "display_name": "A",
-      "id": "98876622534017019",
+      "id": "791012980272136155",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -69,7 +69,7 @@ public:
    {
      "bases": [],
      "display_name": "B",
-      "id": "696381312773707784",
+      "id": "5571050502189662274",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -91,7 +91,7 @@ public:
    {
      "bases": [],
      "display_name": "C",
-      "id": "972031178679364068",
+      "id": "7776249429434912544",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -113,7 +113,7 @@ public:
    {
      "bases": [],
      "display_name": "R",
-      "id": "66905874721300157",
+      "id": "535246997770401258",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -175,23 +175,37 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "98876622534017019",
+      "destination": "791012980272136155",
      "label": "a",
-      "source": "66905874721300157",
+      "source": "535246997770401258",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "696381312773707784",
+      "destination": "5571050502189662274",
      "label": "b",
-      "source": "66905874721300157",
+      "source": "535246997770401258",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "972031178679364068",
+      "destination": "5571050502189662274",
+      "label": "b",
+      "source": "535246997770401258",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "7776249429434912544",
      "label": "c",
-      "source": "66905874721300157",
+      "source": "535246997770401258",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "7776249429434912544",
+      "label": "c",
+      "source": "535246997770401258",
      "type": "association"
    }
  ],
--- 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="f12agynuhnxj2r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1efoyw4quq6ma" width="300%" x="-1" y="-1">
      <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
      <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
      <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,66 +9,66 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12agynuhnxj2r)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1efoyw4quq6ma)" height="48" id="C_0000791012980272136155" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12agynuhnxj2r)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1efoyw4quq6ma)" height="48" id="C_0005571050502189662274" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12agynuhnxj2r)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1efoyw4quq6ma)" height="48" id="C_0007776249429434912544" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12agynuhnxj2r)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1efoyw4quq6ma)" height="86.4141" id="C_0000535246997770401258" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M72.48,106 C60.66,128.37 47.58,153.14 38.31,170.69 " fill="none" id="C_0000535246997770401258&lt;-C_0000791012980272136155" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="78.7,94.22,72.3597,97.6552,73.092,104.829,79.4323,101.3938,78.7,94.22" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="62" y="137.0669">+a</text>
-    <path d="M101,94.22 C101,117.28 101,145.22 101,165.66 " fill="none" id="C_0000066905874721300157-&gt;C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M101,94.22 C101,117.28 101,145.22 101,165.66 " fill="none" id="C_0000535246997770401258-&gt;C_0005571050502189662274" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="101,170.69,105,161.69,101,165.69,97,161.69,101,170.69" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="19" x="102" y="137.0669">+b</text>
-    <path d="M123.3,94.22 C135.58,117.48 150.49,145.69 161.31,166.18 " fill="none" id="C_0000066905874721300157-&gt;C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M123.3,94.22 C135.58,117.48 150.49,145.69 161.31,166.18 " fill="none" id="C_0000535246997770401258-&gt;C_0007776249429434912544" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="163.69,170.69,163.0039,160.8651,161.346,166.2735,155.9375,164.6155,163.69,170.69" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="148" y="137.0669">+c</text>
  </g>
--- a/docs/test_cases/t00007_class_mermaid.svg
+++ b/docs/test_cases/t00007_class_mermaid.svg
@@ -90,8 +90,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L5">
-          <g title="A" id="classId-C_0000098876622534017019-0" class="node default clickable">
+        <a transform="translate(22.7734375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L5">
+          <g title="A" id="classId-C_0000791012980272136155-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -109,8 +109,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L7">
-          <g title="B" id="classId-C_0000696381312773707784-1" class="node default clickable">
+        <a transform="translate(99.3359375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L7">
+          <g title="B" id="classId-C_0005571050502189662274-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -128,8 +128,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L9">
-          <g title="C" id="classId-C_0000972031178679364068-2" class="node default clickable">
+        <a transform="translate(175.8984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L9">
+          <g title="C" id="classId-C_0007776249429434912544-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -147,8 +147,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00007/t00007.cc#L11">
-          <g title="R" id="classId-C_0000066905874721300157-3" class="node default clickable">
+        <a transform="translate(99.3359375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00007/t00007.cc#L11">
+          <g title="R" id="classId-C_0000535246997770401258-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"/>
            <line y2="50.5" y1="50.5" x2="91.3359375" x1="-91.3359375" class="divider"/>
--- a/docs/test_cases/t00008.md
+++ b/docs/test_cases/t00008.md
@@ -80,7 +80,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "A<T,P=T,CMP=nullptr,int N=3>",
-      "id": "2293517130897538130",
+      "id": "18348137047180305042",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -204,7 +204,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "Vector<T>",
-      "id": "1677407014842680311",
+      "id": "13419256118741442489",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -246,7 +246,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "B<T,C<>>",
-      "id": "1968575752686868237",
+      "id": "15748606021494945899",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -294,7 +294,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "B<int,Vector>",
-      "id": "1449136415707203971",
+      "id": "11593091325657631773",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -329,7 +329,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "D",
-      "id": "1562396858816419857",
+      "id": "12499174870531358858",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -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"
        }
      ],
@@ -421,7 +432,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "E",
-      "id": "1787658457052431115",
+      "id": "14301267656419448926",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -443,7 +454,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "E::nested_template<ET>",
-      "id": "1549419203490064906",
+      "id": "12395353627920519248",
      "is_abstract": false,
      "is_nested": true,
      "is_struct": true,
@@ -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 *"
        }
      ],
@@ -504,7 +517,7 @@ template <> struct E::nested_template<char> {
    {
      "bases": [],
      "display_name": "E::nested_template<char>",
-      "id": "33637089897037832",
+      "id": "269096719176302663",
      "is_abstract": false,
      "is_nested": true,
      "is_struct": true,
@@ -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 *"
        }
      ],
@@ -568,33 +583,33 @@ template <> struct E::nested_template<char> {
  "relationships": [
    {
      "access": "public",
-      "destination": "1968575752686868237",
-      "source": "1449136415707203971",
+      "destination": "15748606021494945899",
+      "source": "11593091325657631773",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1449136415707203971",
+      "destination": "11593091325657631773",
      "label": "ints",
-      "source": "1562396858816419857",
+      "source": "12499174870531358858",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1787658457052431115",
-      "source": "1549419203490064906",
+      "destination": "14301267656419448926",
+      "source": "12395353627920519248",
      "type": "containment"
    },
    {
      "access": "public",
-      "destination": "1787658457052431115",
-      "source": "33637089897037832",
+      "destination": "14301267656419448926",
+      "source": "269096719176302663",
      "type": "containment"
    },
    {
      "access": "public",
-      "destination": "1549419203490064906",
-      "source": "33637089897037832",
+      "destination": "12395353627920519248",
+      "source": "269096719176302663",
      "type": "instantiation"
    }
  ],
--- 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="f1igeaw3ui25ey" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fuvfbzwyi1mac" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="124.8281" id="C_0018348137047180305042" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="60.8047" id="C_0013419256118741442489" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="60.8047" id="C_0015748606021494945899" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="48" id="C_0011593091325657631773" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="94.4141" id="C_0012499174870531358858" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L33" xlink:show="new" xlink:title="add" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L33" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="48" id="C_0014301267656419448926" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="60.8047" id="C_0012395353627920519248" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L40" xlink:show="new" xlink:title="get" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L40" target="_top" title="get" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1igeaw3ui25ey)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuvfbzwyi1mac)" height="60.8047" id="C_0000269096719176302663" 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,29 +164,29 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L47" xlink:show="new" xlink:title="getDecl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L47" target="_top" title="getDecl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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"/>
-    <path d="M578.5,264.64 C578.5,277.97 578.5,295.27 578.5,311.55 " fill="none" id="C_0001449136415707203971-&gt;C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M578.5,264.64 C578.5,277.97 578.5,295.27 578.5,311.55 " fill="none" id="C_0011593091325657631773-&gt;C_0015748606021494945899" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="585.5,311.61,578.5,331.61,571.5,311.61,585.5,311.61" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M578.5,131.05 C578.5,160.58 578.5,194.53 578.5,216.46 " fill="none" id="C_0001562396858816419857&lt;-C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M578.5,131.05 C578.5,160.58 578.5,194.53 578.5,216.46 " fill="none" id="C_0012499174870531358858&lt;-C_0011593091325657631773" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="578.5,117.85,574.5,123.85,578.5,129.85,582.5,123.85,578.5,117.85" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="584.5" cy="172.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="591.5" y="176.0669">ints</text>
-    <path d="M915.02,271.16 C901.78,287.89 885.16,308.88 871.28,326.42 " fill="none" id="C_0001549419203490064906-&gt;C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M915.02,271.16 C901.78,287.89 885.16,308.88 871.28,326.42 " fill="none" id="C_0012395353627920519248-&gt;C_0014301267656419448926" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="866.9278" cy="331.9193" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
    <line style="stroke: #A80036; stroke-width: 1.0;" x1="871.8955" x2="861.96" y1="325.6487" y2="338.19"/>
    <line style="stroke: #A80036; stroke-width: 1.0;" x1="873.1984" x2="860.6571" y1="336.8871" y2="326.9516"/>
-    <path d="M840.4,101.25 C836.74,140.24 831.51,210.75 834.5,271 C835.36,288.27 837.13,307.32 838.87,323.47 " fill="none" id="C_0000033637089897037832-&gt;C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M840.4,101.25 C836.74,140.24 831.51,210.75 834.5,271 C835.36,288.27 837.13,307.32 838.87,323.47 " fill="none" id="C_0000269096719176302663-&gt;C_0014301267656419448926" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="839.6807" cy="330.5307" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
    <line style="stroke: #A80036; stroke-width: 1.0;" x1="838.7813" x2="840.58" y1="322.5814" y2="338.48"/>
    <line style="stroke: #A80036; stroke-width: 1.0;" x1="847.6299" x2="831.7314" y1="329.6314" y2="331.4301"/>
-    <path d="M860.27,101.15 C874.53,126.38 895.29,163.08 911.83,192.34 " fill="none" id="C_0000033637089897037832-&gt;C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M860.27,101.15 C874.53,126.38 895.29,163.08 911.83,192.34 " fill="none" id="C_0000269096719176302663-&gt;C_0012395353627920519248" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="917.99,189.01,921.74,209.87,905.8,195.9,917.99,189.01" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00008_class_mermaid.svg
+++ b/docs/test_cases/t00008_class_mermaid.svg
@@ -114,8 +114,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L9">
-          <g title="A" id="classId-C_0002293517130897538130-0" class="node default clickable">
+        <a transform="translate(129.0859375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L9">
+          <g title="A" id="classId-C_0018348137047180305042-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"/>
            <line y2="83.5" y1="83.5" x2="121.0859375" x1="-121.0859375" class="divider"/>
@@ -163,8 +163,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L20">
-          <g title="Vector" id="classId-C_0001677407014842680311-1" class="node default clickable">
+        <a transform="translate(393.2734375, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L20">
+          <g title="Vector" id="classId-C_0013419256118741442489-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"/>
            <line y2="28.5" y1="28.5" x2="93.1015625" x1="-93.1015625" class="divider"/>
@@ -187,8 +187,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L24">
-          <g title="B" id="classId-C_0001968575752686868237-2" class="node default clickable">
+        <a transform="translate(618.796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L24">
+          <g title="B" id="classId-C_0015748606021494945899-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"/>
            <line y2="28.5" y1="28.5" x2="104.6640625" x1="-104.6640625" class="divider"/>
@@ -211,8 +211,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L24">
-          <g title="B" id="classId-C_0001449136415707203971-3" class="node default clickable">
+        <a transform="translate(618.796875, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L24">
+          <g title="B" id="classId-C_0011593091325657631773-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"/>
            <line y2="17.5" y1="17.5" x2="59.078125" x1="-59.078125" class="divider"/>
@@ -230,8 +230,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L28">
-          <g title="D" id="classId-C_0001562396858816419857-4" class="node default clickable">
+        <a transform="translate(618.796875, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L28">
+          <g title="D" id="classId-C_0012499174870531358858-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"/>
            <line y2="6.5" y1="6.5" x2="82.421875" x1="-82.421875" class="divider"/>
@@ -264,8 +264,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L36">
-          <g title="E" id="classId-C_0001787658457052431115-5" class="node default clickable">
+        <a transform="translate(874.328125, 102.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L36">
+          <g title="E" id="classId-C_0014301267656419448926-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"/>
            <line y2="17.5" y1="17.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -283,8 +283,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L37">
-          <g title="E##nested_template" id="classId-C_0001549419203490064906-6" class="node default clickable">
+        <a transform="translate(874.328125, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L37">
+          <g title="E##nested_template" id="classId-C_0012395353627920519248-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"/>
            <line y2="6.5" y1="6.5" x2="100.8671875" x1="-100.8671875" class="divider"/>
@@ -307,8 +307,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00008/t00008.cc#L44">
-          <g title="E##nested_template" id="classId-C_0000033637089897037832-7" class="node default clickable">
+        <a transform="translate(950.37890625, 304.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00008/t00008.cc#L44">
+          <g title="E##nested_template" id="classId-C_0000269096719176302663-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"/>
            <line y2="6.5" y1="6.5" x2="117.1015625" x1="-117.1015625" class="divider"/>
--- a/docs/test_cases/t00009.md
+++ b/docs/test_cases/t00009.md
@@ -53,7 +53,7 @@ public:
    {
      "bases": [],
      "display_name": "A<T>",
-      "id": "412228989111660105",
+      "id": "3297831912893280842",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -95,7 +95,7 @@ public:
    {
      "bases": [],
      "display_name": "A<int>",
-      "id": "1894387438043499",
+      "id": "15155099504347999",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -124,7 +124,7 @@ public:
    {
      "bases": [],
      "display_name": "A<std::string>",
-      "id": "1340793233843139195",
+      "id": "10726345870745113562",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -153,7 +153,7 @@ public:
    {
      "bases": [],
      "display_name": "A<std::vector<std::string>>",
-      "id": "1370808797762248850",
+      "id": "10966470382097990802",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -189,7 +189,7 @@ public:
    {
      "bases": [],
      "display_name": "B",
-      "id": "176239714450247310",
+      "id": "1409917715601978480",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -251,41 +251,55 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "412228989111660105",
-      "source": "1894387438043499",
+      "destination": "3297831912893280842",
+      "source": "15155099504347999",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "412228989111660105",
-      "source": "1340793233843139195",
+      "destination": "3297831912893280842",
+      "source": "10726345870745113562",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "412228989111660105",
-      "source": "1370808797762248850",
+      "destination": "3297831912893280842",
+      "source": "10966470382097990802",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1894387438043499",
+      "destination": "15155099504347999",
      "label": "aint",
-      "source": "176239714450247310",
+      "source": "1409917715601978480",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1340793233843139195",
+      "destination": "10726345870745113562",
      "label": "astring",
-      "source": "176239714450247310",
+      "source": "1409917715601978480",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "1370808797762248850",
+      "destination": "3297831912893280842",
+      "label": "astring",
+      "source": "1409917715601978480",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "10966470382097990802",
      "label": "avector",
-      "source": "176239714450247310",
+      "source": "1409917715601978480",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "3297831912893280842",
+      "label": "avector",
+      "source": "1409917715601978480",
      "type": "association"
    }
  ],
--- 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">
+<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:576px;height:352px;" version="1.1" viewBox="0 0 576 352" width="576px" zoomAndPan="magnify">
  <defs>
-    <filter height="300%" id="fhfxu4pz10wu8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lrrkaauop46f" width="300%" x="-1" y="-1">
      <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
      <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
      <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhfxu4pz10wu8)" 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>
-      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="317.5" y="5"/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="318.5" y="17.1387">T</text>
-      <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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lrrkaauop46f)" height="60.8047" id="C_0003297831912893280842" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="366.5" y="8"/>
+      <ellipse cx="392.3" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M395.2688,29.6406 Q394.6906,29.9375 394.05,30.0781 Q393.4094,30.2344 392.7063,30.2344 Q390.2063,30.2344 388.8781,28.5938 Q387.5656,26.9375 387.5656,23.8125 Q387.5656,20.6875 388.8781,19.0313 Q390.2063,17.375 392.7063,17.375 Q393.4094,17.375 394.05,17.5313 Q394.7063,17.6875 395.2688,17.9844 L395.2688,20.7031 Q394.6438,20.125 394.05,19.8594 Q393.4563,19.5781 392.8313,19.5781 Q391.4875,19.5781 390.8,20.6563 Q390.1125,21.7188 390.1125,23.8125 Q390.1125,25.9063 390.8,26.9844 Q391.4875,28.0469 392.8313,28.0469 Q393.4563,28.0469 394.05,27.7813 Q394.6438,27.5 395.2688,26.9219 L395.2688,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.7" y="28.1543">A</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="9" x="435.5" y="5"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="436.5" y="17.1387">T</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="440.5" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="367.5" x2="440.5" y1="48" y2="48"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="386.5" y="62.2104">value : T</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhfxu4pz10wu8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lrrkaauop46f)" height="48" id="C_0000015155099504347999" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhfxu4pz10wu8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lrrkaauop46f)" height="48" id="C_0010726345870745113562" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhfxu4pz10wu8)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lrrkaauop46f)" height="48" id="C_0010966470382097990802" 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,49 +56,55 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhfxu4pz10wu8)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lrrkaauop46f)" height="86.4141" id="C_0001409917715601978480" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="275.5" y="255"/>
+      <ellipse cx="395.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M398.7188,276.6406 Q398.1406,276.9375 397.5,277.0781 Q396.8594,277.2344 396.1563,277.2344 Q393.6563,277.2344 392.3281,275.5938 Q391.0156,273.9375 391.0156,270.8125 Q391.0156,267.6875 392.3281,266.0313 Q393.6563,264.375 396.1563,264.375 Q396.8594,264.375 397.5,264.5313 Q398.1563,264.6875 398.7188,264.9844 L398.7188,267.7031 Q398.0938,267.125 397.5,266.8594 Q396.9063,266.5781 396.2813,266.5781 Q394.9375,266.5781 394.25,267.6563 Q393.5625,268.7188 393.5625,270.8125 Q393.5625,272.9063 394.25,273.9844 Q394.9375,275.0469 396.2813,275.0469 Q396.9063,275.0469 397.5,274.7813 Q398.0938,274.5 398.7188,273.9219 L398.7188,276.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="416.25" y="275.1543">B</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="276.5" x2="531.5" y1="287" y2="287"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="276.5" x2="531.5" y1="295" y2="295"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="281.5" y="301"/>
+      <ellipse cx="286.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="295.5" y="309.2104">aint : A&lt;int&gt;</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="281.5" y="313.8047"/>
+      <ellipse cx="286.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="295.5" y="322.0151">astring : A&lt;std::string&gt; *</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="281.5" y="326.6094"/>
+      <ellipse cx="286.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="295.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;"/>
-    <polygon fill="none" points="326.26,87.93,316.7,69.02,335.96,77.84,326.26,87.93" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M286,89.43 C286,103.45 286,118.05 286,129.71 " fill="none" id="C_0000412228989111660105&lt;-C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="279,89.02,286,69.02,293,89.02,279,89.02" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M231.25,73.27 C201.6,91.56 165.73,113.69 139.31,129.98 " fill="none" id="C_0000412228989111660105&lt;-C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="none" points="227.62,67.28,248.32,62.74,234.97,79.2,227.62,67.28" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M384.78,178.13 C369.83,196.12 348.5,221.79 329.48,244.67 " fill="none" id="C_0000001894387438043499-&gt;C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#FFFFFF" points="320.94,254.95,327.8499,252.8878,328.604,245.7162,321.6941,247.7784,320.94,254.95" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="360" y="221.0669">aint</text>
-    <path d="M286,183.17 C286,203.68 286,231.8 286,254.95 " fill="none" id="C_0001340793233843139195&lt;-C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="286,178.13,282,187.13,286,183.13,290,187.13,286,178.13" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="287" y="221.0669">astring</text>
-    <path d="M136.17,181.37 C162.91,202.01 200.62,231.11 231.52,254.95 " fill="none" id="C_0001370808797762248850&lt;-C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="#A80036" points="131.97,178.13,136.6467,186.7977,135.9267,181.1868,141.5376,180.4669,131.97,178.13" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="221.0669">avector</text>
+    <path d="M404,89.43 C404,103.45 404,118.05 404,129.71 " fill="none" id="C_0003297831912893280842&lt;-C_0000015155099504347999" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="397,89.02,404,69.02,411,89.02,397,89.02" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M358.73,83.04 C342.22,98.92 324.19,116.26 310.22,129.71 " fill="none" id="C_0003297831912893280842&lt;-C_0010726345870745113562" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="354.04,77.84,373.3,69.02,363.74,87.93,354.04,77.84" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M347.63,60.68 C295.25,80.37 217.4,109.63 163.45,129.91 " fill="none" id="C_0003297831912893280842&lt;-C_0010966470382097990802" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="345.18,54.13,366.36,53.65,350.1,67.23,345.18,54.13" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M404,178.13 C404,195.39 404,219.72 404,241.88 " fill="none" id="C_0000015155099504347999-&gt;C_0001409917715601978480" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#FFFFFF" points="404,254.95,408,248.95,404,242.95,400,248.95,404,254.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="405" y="221.0669">aint</text>
+    <path d="M308.55,182.14 C325.66,202.72 349.49,231.4 369.06,254.95 " fill="none" id="C_0010726345870745113562&lt;-C_0001409917715601978480" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="305.22,178.13,307.8845,187.6116,308.4111,181.9793,314.0433,182.5059,305.22,178.13" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="343" y="221.0669">astring</text>
+    <path d="M427.34,73.87 C437.01,90.14 447.09,110.28 452,130 C462.63,172.74 445.53,221.05 428.86,254.67 " fill="none" id="C_0003297831912893280842&lt;-C_0001409917715601978480" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="424.63,69.39,425.8927,79.1576,427.2297,73.661,432.7263,74.998,424.63,69.39" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="456" y="158.5669">astring</text>
+    <path d="M445.84,63.05 C469.13,78.7 495.97,101.58 509,130 C517.89,149.39 516.24,157.93 509,178 C498.39,207.42 476.54,234.14 455.52,254.78 " fill="none" id="C_0003297831912893280842&lt;-C_0001409917715601978480-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="441.54,60.21,446.8426,68.5096,445.7112,62.967,451.2538,61.8356,441.54,60.21" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="48" x="516" y="158.5669">avector</text>
+    <path d="M155.93,180.36 C199.93,201.05 263.03,230.72 314.58,254.95 " fill="none" id="C_0010966470382097990802&lt;-C_0001409917715601978480" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="#A80036" points="151.19,178.13,157.6336,185.5785,155.7151,180.2569,161.0367,178.3384,151.19,178.13" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="48" x="245" y="221.0669">avector</text>
  </g>
 </svg>
--- a/docs/test_cases/t00009_class_mermaid.svg
+++ b/docs/test_cases/t00009_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 530.859375 393" style="max-width: 530.859px; background-color: white;" width="530.859375" 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 705.046875 393" style="max-width: 705.047px; background-color: white;" width="705.046875" 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,12 +50,14 @@
    <g class="root">
      <g class="clusters"/>
      <g class="edgePaths">
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M40.3984375,256L40.3984375,260.1666666666667C40.3984375,264.3333333333333,40.3984375,272.6666666666667,57.375,284.40742141763485C74.3515625,296.1481761686031,108.3046875,311.29635233720614,125.28125,318.8704404215077L142.2578125,326.4445285058092"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.96875,256L184.96875,260.1666666666667C184.96875,264.3333333333333,184.96875,272.6666666666667,184.96875,281C184.96875,289.3333333333333,184.96875,297.6666666666667,184.96875,301.8333333333333L184.96875,306"/>
-        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M410,256L410,260.1666666666667C410,264.3333333333333,410,272.6666666666667,379.61328125,285.5429830347637C349.2265625,298.41929940286076,288.453125,315.83859880572146,258.06640625,324.5482485071518L227.6796875,333.25789820858216"/>
-        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M91.86849640052355,131L83.29015325043629,136.66666666666666C74.71181010034904,142.33333333333334,57.55512380017452,153.66666666666666,48.97678065008726,165C40.3984375,176.33333333333334,40.3984375,187.66666666666666,40.3984375,193.33333333333334L40.3984375,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M184.96875,131L184.96875,136.66666666666666C184.96875,142.33333333333334,184.96875,153.66666666666666,184.96875,165C184.96875,176.33333333333334,184.96875,187.66666666666666,184.96875,193.33333333333334L184.96875,199"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M329.8841623036649,131L343.2368019197208,136.66666666666666C356.5894415357766,142.33333333333334,383.2947207678883,153.66666666666666,396.6473603839442,165C410,176.33333333333334,410,187.66666666666666,410,193.33333333333334L410,199"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id1" d="M40.3984375,256L40.3984375,260.1666666666667C40.3984375,264.3333333333333,40.3984375,272.6666666666667,94.88020833333333,286.3410697048483C149.36197916666666,300.0154727430299,258.3255208333333,319.03094548605975,312.8072916666667,328.53868185757466L367.2890625,338.0464182290896"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id2" d="M184.96875,256L184.96875,260.1666666666667C184.96875,264.3333333333333,184.96875,272.6666666666667,215.35546875,285.5429830347637C245.7421875,298.41929940286076,306.515625,315.83859880572146,336.90234375,324.5482485071518L367.2890625,333.25789820858216"/>
+        <path marker-end="url(#classDiagram-extensionEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id3" d="M410,256L410,260.1666666666667C410,264.3333333333333,410,272.6666666666667,410,281C410,289.3333333333333,410,297.6666666666667,410,301.8333333333333L410,306"/>
+        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M262.203125,107.68869559703228L225.23567708333334,117.24057966419356C188.26822916666666,126.79246373135486,114.33333333333333,145.89623186567744,77.36588541666667,161.1147825995054C40.3984375,176.33333333333334,40.3984375,187.66666666666666,40.3984375,193.33333333333334L40.3984375,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id5" d="M265.0845876963351,131L251.73194808027927,136.66666666666666C238.3793084642234,142.33333333333334,211.6740292321117,153.66666666666666,198.32138961605585,165C184.96875,176.33333333333334,184.96875,187.66666666666666,184.96875,193.33333333333334L184.96875,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id6" d="M523.692490183246,131L534.1682209860384,136.66666666666666C544.6439517888307,142.33333333333334,565.5954133944153,153.66666666666666,576.0711441972077,169.75C586.546875,185.83333333333334,586.546875,206.66666666666666,586.546875,226C586.546875,245.33333333333334,586.546875,263.1666666666667,564.2408854166666,280.23264964451135C541.9348958333334,297.29863262235597,497.3229166666667,313.59726524471193,475.0169270833333,321.7465815558899L452.7109375,329.8958978670679"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id7" d="M410,131L410,136.66666666666666C410,142.33333333333334,410,153.66666666666666,410,165C410,176.33333333333334,410,187.66666666666666,410,193.33333333333334L410,199"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-solid relation" id="id8" d="M557.796875,124.60489233209296L575.8541666666666,131.33741027674412C593.9114583333334,138.06992822139532,630.0260416666666,151.53496411069764,648.0833333333334,168.6841487220155C666.140625,185.83333333333334,666.140625,206.66666666666666,666.140625,226C666.140625,245.33333333333334,666.140625,263.1666666666667,630.5690104166666,281.0407923097257C594.9973958333334,298.9149179527847,523.8541666666666,316.82983590556944,488.2825520833333,325.7872948819618L452.7109375,334.74475385835416"/>
      </g>
      <g class="edgeLabels">
        <g transform="translate(undefined, undefined)" class="edgeLabel">
@@ -113,6 +115,17 @@
            </foreignObject>
          </g>
        </g>
+        <g transform="translate(586.546875, 227.5)" class="edgeLabel">
+          <g transform="translate(-28.6875, -9)" class="label">
+            <foreignObject height="18" width="57.375">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel">+astring</span>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
        <g transform="translate(410, 165)" class="edgeLabel">
          <g transform="translate(-30.90625, -9)" class="label">
            <foreignObject height="18" width="61.8125">
@@ -124,10 +137,21 @@
            </foreignObject>
          </g>
        </g>
+        <g transform="translate(666.140625, 227.5)" class="edgeLabel">
+          <g transform="translate(-30.90625, -9)" class="label">
+            <foreignObject height="18" width="61.8125">
+              <div xmlns="http://www.w3.org/1999/xhtml" style="display: inline-block; white-space: nowrap;">
+                <span class="edgeLabel">
+                  <span class="edgeLabel">+avector</span>
+                </span>
+              </div>
+            </foreignObject>
+          </g>
+        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(184.96875, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7">
-          <g title="A" id="classId-C_0000412228989111660105-0" class="node default clickable">
+        <a transform="translate(410, 345.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7">
+          <g title="A" id="classId-C_0003297831912893280842-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"/>
            <line y2="28.5" y1="28.5" x2="42.7109375" x1="-42.7109375" class="divider"/>
@@ -150,8 +174,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7">
-          <g title="A" id="classId-C_0000001894387438043499-1" class="node default clickable">
+        <a transform="translate(40.3984375, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7">
+          <g title="A" id="classId-C_0000015155099504347999-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"/>
            <line y2="17.5" y1="17.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -169,8 +193,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7">
-          <g title="A" id="classId-C_0001340793233843139195-2" class="node default clickable">
+        <a transform="translate(184.96875, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7">
+          <g title="A" id="classId-C_0010726345870745113562-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"/>
            <line y2="17.5" y1="17.5" x2="62.171875" x1="-62.171875" class="divider"/>
@@ -188,8 +212,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L7">
-          <g title="A" id="classId-C_0001370808797762248850-3" class="node default clickable">
+        <a transform="translate(410, 227.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L7">
+          <g title="A" id="classId-C_0010966470382097990802-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"/>
            <line y2="17.5" y1="17.5" x2="112.859375" x1="-112.859375" class="divider"/>
@@ -207,8 +231,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(184.96875, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00009/t00009.cc#L12">
-          <g title="B" id="classId-C_0000176239714450247310-4" class="node default clickable">
+        <a transform="translate(410, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00009/t00009.cc#L12">
+          <g title="B" id="classId-C_0001409917715601978480-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"/>
            <line y2="50.5" y1="50.5" x2="147.796875" x1="-147.796875" class="divider"/>
--- a/docs/test_cases/t00010.md
+++ b/docs/test_cases/t00010.md
@@ -52,7 +52,7 @@ public:
    {
      "bases": [],
      "display_name": "A<T,P>",
-      "id": "2222216618904514099",
+      "id": "17777732951236112797",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -112,7 +112,7 @@ public:
    {
      "bases": [],
      "display_name": "A<T,std::string>",
-      "id": "1861520693741915300",
+      "id": "14892165549935322401",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -147,7 +147,7 @@ public:
    {
      "bases": [],
      "display_name": "B<T>",
-      "id": "2303611426082708583",
+      "id": "18428891408661668669",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -189,7 +189,7 @@ public:
    {
      "bases": [],
      "display_name": "B<int>",
-      "id": "1498376939480949099",
+      "id": "11987015515847592796",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -218,7 +218,7 @@ public:
    {
      "bases": [],
      "display_name": "C",
-      "id": "1880966578968892571",
+      "id": "15047732631751140570",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -256,28 +256,28 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "2222216618904514099",
-      "source": "1861520693741915300",
+      "destination": "17777732951236112797",
+      "source": "14892165549935322401",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1861520693741915300",
+      "destination": "14892165549935322401",
      "label": "astring",
-      "source": "2303611426082708583",
+      "source": "18428891408661668669",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "2303611426082708583",
-      "source": "1498376939480949099",
+      "destination": "18428891408661668669",
+      "source": "11987015515847592796",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1498376939480949099",
+      "destination": "11987015515847592796",
      "label": "aintstring",
-      "source": "1880966578968892571",
+      "source": "15047732631751140570",
      "type": "aggregation"
    }
  ],
--- 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="f3z3laekak5fo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18nbvzi5eq0kg" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3z3laekak5fo)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18nbvzi5eq0kg)" height="73.6094" id="C_0017777732951236112797" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3z3laekak5fo)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18nbvzi5eq0kg)" height="48" id="C_0014892165549935322401" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3z3laekak5fo)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18nbvzi5eq0kg)" height="60.8047" id="C_0018428891408661668669" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3z3laekak5fo)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18nbvzi5eq0kg)" height="48" id="C_0011987015515847592796" 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,30 +70,30 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3z3laekak5fo)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18nbvzi5eq0kg)" height="60.8047" id="C_0015047732631751140570" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M92.5,441.14 C92.5,452.67 92.5,467.17 92.5,481.41 " fill="none" id="C_0014892165549935322401-&gt;C_0017777732951236112797" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="99.5,481.71,92.5,501.71,85.5,481.71,99.5,481.71" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M92.5,329.5 C92.5,350.65 92.5,375.32 92.5,392.88 " fill="none" id="C_0002303611426082708583&lt;-C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M92.5,329.5 C92.5,350.65 92.5,375.32 92.5,392.88 " fill="none" id="C_0018428891408661668669&lt;-C_0014892165549935322401" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="92.5,316.21,88.5,322.21,92.5,328.21,96.5,322.21,92.5,316.21" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="98.5" cy="355.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="44" x="105.5" y="359.0669">astring</text>
-    <path d="M92.5,194.24 C92.5,205.87 92.5,220.42 92.5,234.43 " fill="none" id="C_0001498376939480949099-&gt;C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M92.5,194.24 C92.5,205.87 92.5,220.42 92.5,234.43 " fill="none" id="C_0011987015515847592796-&gt;C_0018428891408661668669" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="99.5,234.81,92.5,254.81,85.5,234.81,99.5,234.81" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M92.5,82.5 C92.5,103.65 92.5,128.32 92.5,145.88 " fill="none" id="C_0001880966578968892571&lt;-C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M92.5,82.5 C92.5,103.65 92.5,128.32 92.5,145.88 " fill="none" id="C_0015047732631751140570&lt;-C_0011987015515847592796" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="92.5,69.21,88.5,75.21,92.5,81.21,96.5,75.21,92.5,69.21" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="98.5" cy="108.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="60" x="105.5" y="112.0669">aintstring</text>
--- a/docs/test_cases/t00010_class_mermaid.svg
+++ b/docs/test_cases/t00010_class_mermaid.svg
@@ -102,8 +102,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L7">
-          <g title="A" id="classId-C_0002222216618904514099-0" class="node default clickable">
+        <a transform="translate(105.9921875, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L7">
+          <g title="A" id="classId-C_0017777732951236112797-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"/>
            <line y2="39.5" y1="39.5" x2="49.9765625" x1="-49.9765625" class="divider"/>
@@ -131,8 +131,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L7">
-          <g title="A" id="classId-C_0001861520693741915300-1" class="node default clickable">
+        <a transform="translate(105.9921875, 437.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L7">
+          <g title="A" id="classId-C_0014892165549935322401-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"/>
            <line y2="17.5" y1="17.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -150,8 +150,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L13">
-          <g title="B" id="classId-C_0002303611426082708583-2" class="node default clickable">
+        <a transform="translate(105.9921875, 301.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L13">
+          <g title="B" id="classId-C_0018428891408661668669-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"/>
            <line y2="28.5" y1="28.5" x2="97.9921875" x1="-97.9921875" class="divider"/>
@@ -174,8 +174,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L13">
-          <g title="B" id="classId-C_0001498376939480949099-3" class="node default clickable">
+        <a transform="translate(105.9921875, 183.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L13">
+          <g title="B" id="classId-C_0011987015515847592796-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"/>
            <line y2="17.5" y1="17.5" x2="32.3984375" x1="-32.3984375" class="divider"/>
@@ -193,8 +193,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00010/t00010.cc#L18">
-          <g title="C" id="classId-C_0001880966578968892571-4" class="node default clickable">
+        <a transform="translate(105.9921875, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00010/t00010.cc#L18">
+          <g title="C" id="classId-C_0015047732631751140570-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"/>
            <line y2="28.5" y1="28.5" x2="74.4296875" x1="-74.4296875" class="divider"/>
--- a/docs/test_cases/t00011.md
+++ b/docs/test_cases/t00011.md
@@ -61,7 +61,7 @@ public:
    {
      "bases": [],
      "display_name": "D<T>",
-      "id": "1150639902748052276",
+      "id": "9205119221984418212",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -103,7 +103,7 @@ public:
    {
      "bases": [],
      "display_name": "A",
-      "id": "1420516952857803719",
+      "id": "11364135622862429756",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -152,7 +154,7 @@ public:
    {
      "bases": [],
      "display_name": "B",
-      "id": "1687427603952049829",
+      "id": "13499420831616398636",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -217,16 +221,16 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "1687427603952049829",
+      "destination": "13499420831616398636",
      "label": "<<friend>>",
-      "source": "1420516952857803719",
+      "source": "11364135622862429756",
      "type": "friendship"
    },
    {
      "access": "public",
-      "destination": "1420516952857803719",
+      "destination": "11364135622862429756",
      "label": "m_a",
-      "source": "1687427603952049829",
+      "source": "13499420831616398636",
      "type": "association"
    }
  ],
--- 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="ftsg2oz04mmgl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fe7sfpmlwt7ae" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftsg2oz04mmgl)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe7sfpmlwt7ae)" height="60.8047" id="C_0009205119221984418212" 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,55 +19,55 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftsg2oz04mmgl)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe7sfpmlwt7ae)" height="60.8047" id="C_0011364135622862429756" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L16" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L16" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftsg2oz04mmgl)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe7sfpmlwt7ae)" height="73.6094" id="C_0013499420831616398636" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L28" xlink:show="new" xlink:title="foo" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L28" target="_top" title="foo" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <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_0011364135622862429756&lt;-C_0013499420831616398636" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="119.54,69.18,110.5057,73.102,116.1575,72.8622,116.3973,78.514,119.54,69.18" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="109.5" cy="108.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="52" x="116.5" y="112.0669">«friend»</text>
-    <path d="M170.13,145.75 C173.19,131.26 175.29,114.39 173.5,99 C172.56,90.88 170.92,82.26 169.08,74.18 " fill="none" id="C_0001687427603952049829-&gt;C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M170.13,145.75 C173.19,131.26 175.29,114.39 173.5,99 C172.56,90.88 170.92,82.26 169.08,74.18 " fill="none" id="C_0013499420831616398636-&gt;C_0011364135622862429756" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="167.92,69.22,166.0877,78.8969,169.0652,74.0871,173.875,77.0646,167.92,69.22" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="179.5" cy="108.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="28" x="186.5" y="112.0669">m_a</text>
--- a/docs/test_cases/t00011_class_mermaid.svg
+++ b/docs/test_cases/t00011_class_mermaid.svg
@@ -78,8 +78,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L10">
-          <g title="D" id="classId-C_0001150639902748052276-0" class="node default clickable">
+        <a transform="translate(48.703125, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L10">
+          <g title="D" id="classId-C_0009205119221984418212-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"/>
            <line y2="28.5" y1="28.5" x2="40.703125" x1="-40.703125" class="divider"/>
@@ -102,8 +102,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L14">
-          <g title="A" id="classId-C_0001420516952857803719-1" class="node default clickable">
+        <a transform="translate(189.375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L14">
+          <g title="A" id="classId-C_0011364135622862429756-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"/>
            <line y2="6.5" y1="6.5" x2="49.96875" x1="-49.96875" class="divider"/>
@@ -126,8 +126,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00011/t00011.cc#L26">
-          <g title="B" id="classId-C_0001687427603952049829-2" class="node default clickable">
+        <a transform="translate(189.375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00011/t00011.cc#L26">
+          <g title="B" id="classId-C_0013499420831616398636-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"/>
            <line y2="17.5" y1="17.5" x2="49.96875" x1="-49.96875" class="divider"/>
--- a/docs/test_cases/t00012.md
+++ b/docs/test_cases/t00012.md
@@ -68,7 +68,7 @@ class R {
    {
      "bases": [],
      "display_name": "A<T,Ts...>",
-      "id": "1773299890023132282",
+      "id": "14186399120185058260",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -128,7 +128,7 @@ class R {
    {
      "bases": [],
      "display_name": "B<int... Is>",
-      "id": "2061171077567279746",
+      "id": "16489368620538237973",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -171,7 +171,7 @@ class R {
    {
      "bases": [],
      "display_name": "C<T,int... Is>",
-      "id": "627809578407650629",
+      "id": "5022476627261205034",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -220,7 +220,7 @@ class R {
    {
      "bases": [],
      "display_name": "A<int,std::string,float>",
-      "id": "286972398942005457",
+      "id": "2295779191536043659",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -261,7 +261,7 @@ class R {
    {
      "bases": [],
      "display_name": "A<int,std::string,bool>",
-      "id": "299466181098300963",
+      "id": "2395729448786407708",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -302,7 +302,7 @@ class R {
    {
      "bases": [],
      "display_name": "B<3,2,1>",
-      "id": "489063277971613593",
+      "id": "3912506223772908750",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -343,7 +343,7 @@ class R {
    {
      "bases": [],
      "display_name": "B<1,1,1,1>",
-      "id": "14232362483200599",
+      "id": "113858899865604792",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -390,7 +390,7 @@ class R {
    {
      "bases": [],
      "display_name": "C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>",
-      "id": "1478239414632239754",
+      "id": "11825915317057918032",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -471,7 +471,7 @@ class R {
    {
      "bases": [],
      "display_name": "R",
-      "id": "559263385732885469",
+      "id": "4474107085863083753",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -557,67 +557,67 @@ class R {
  "relationships": [
    {
      "access": "public",
-      "destination": "1773299890023132282",
-      "source": "286972398942005457",
+      "destination": "14186399120185058260",
+      "source": "2295779191536043659",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1773299890023132282",
-      "source": "299466181098300963",
+      "destination": "14186399120185058260",
+      "source": "2395729448786407708",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2061171077567279746",
-      "source": "489063277971613593",
+      "destination": "16489368620538237973",
+      "source": "3912506223772908750",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2061171077567279746",
-      "source": "14232362483200599",
+      "destination": "16489368620538237973",
+      "source": "113858899865604792",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "627809578407650629",
-      "source": "1478239414632239754",
+      "destination": "5022476627261205034",
+      "source": "11825915317057918032",
      "type": "instantiation"
    },
    {
      "access": "private",
-      "destination": "286972398942005457",
+      "destination": "2295779191536043659",
      "label": "a1",
-      "source": "559263385732885469",
+      "source": "4474107085863083753",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "299466181098300963",
+      "destination": "2395729448786407708",
      "label": "a2",
-      "source": "559263385732885469",
+      "source": "4474107085863083753",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "489063277971613593",
+      "destination": "3912506223772908750",
      "label": "b1",
-      "source": "559263385732885469",
+      "source": "4474107085863083753",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "14232362483200599",
+      "destination": "113858899865604792",
      "label": "b2",
-      "source": "559263385732885469",
+      "source": "4474107085863083753",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1478239414632239754",
+      "destination": "11825915317057918032",
      "label": "c1",
-      "source": "559263385732885469",
+      "source": "4474107085863083753",
      "type": "aggregation"
    }
  ],
--- 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="f1g3jv2u1oizlr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1utp2iqmy6bb3" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="73.6094" id="C_0014186399120185058260" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="60.8047" id="C_0016489368620538237973" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="60.8047" id="C_0005022476627261205034" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="48" id="C_0002295779191536043659" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="48" id="C_0002395729448786407708" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="48" id="C_0003912506223772908750" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="48" id="C_0000113858899865604792" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="48" id="C_0011825915317057918032" 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,79 +117,79 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1g3jv2u1oizlr)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utp2iqmy6bb3)" height="112.0234" id="C_0004474107085863083753" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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(#f1g3jv2u1oizlr)" 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(#f1utp2iqmy6bb3)" 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;"/>
+    <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0002295779191536043659-&gt;C_0014186399120185058260" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="885.81,285.1,890.71,305.71,874.02,292.66,885.81,285.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1007.63,245.14 C995.06,258.14 978.84,274.92 963.44,290.85 " fill="none" id="C_0000299466181098300963-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M1007.63,245.14 C995.06,258.14 978.84,274.92 963.44,290.85 " fill="none" id="C_0002395729448786407708-&gt;C_0014186399120185058260" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="968.01,296.2,949.08,305.71,957.95,286.47,968.01,296.2" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1193.38,245.14 C1200.19,258.99 1209.11,277.13 1217.38,293.96 " fill="none" id="C_0000489063277971613593-&gt;C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M1193.38,245.14 C1200.19,258.99 1209.11,277.13 1217.38,293.96 " fill="none" id="C_0003912506223772908750-&gt;C_0016489368620538237973" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="1223.76,291.07,1226.3,312.11,1211.2,297.25,1223.76,291.07" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1287.82,245.14 C1281.12,258.99 1272.35,277.13 1264.22,293.96 " fill="none" id="C_0000014232362483200599-&gt;C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M1287.82,245.14 C1281.12,258.99 1272.35,277.13 1264.22,293.96 " fill="none" id="C_0000113858899865604792-&gt;C_0016489368620538237973" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="1270.45,297.14,1255.45,312.11,1257.85,291.05,1270.45,297.14" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M253,245.14 C253,258.47 253,275.77 253,292.05 " fill="none" id="C_0001478239414632239754-&gt;C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M253,245.14 C253,258.47 253,275.77 253,292.05 " fill="none" id="C_0011825915317057918032-&gt;C_0005022476627261205034" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="260,292.11,253,312.11,246,292.11,260,292.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M950.89,128.54 C920.8,152.7 888.38,178.73 865.86,196.83 " fill="none" id="C_0000559263385732885469&lt;-C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M950.89,128.54 C920.8,152.7 888.38,178.73 865.86,196.83 " fill="none" id="C_0004474107085863083753&lt;-C_0002295779191536043659" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="961.41,120.08,954.2275,120.722,952.0576,127.5988,959.2401,126.9569,961.41,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="925" y="156.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="935" y="163.0669">a1</text>
-    <path d="M1030,133.26 C1030,155.95 1030,179.72 1030,196.62 " fill="none" id="C_0000559263385732885469&lt;-C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1030,133.26 C1030,155.95 1030,179.72 1030,196.62 " fill="none" id="C_0004474107085863083753&lt;-C_0002395729448786407708" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="1030,120.08,1026,126.08,1030,132.08,1034,126.08,1030,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1033" y="156.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1043" y="163.0669">a2</text>
-    <path d="M1093.21,129.46 C1116.56,153.27 1141.57,178.77 1159.08,196.62 " fill="none" id="C_0000559263385732885469&lt;-C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1093.21,129.46 C1116.56,153.27 1141.57,178.77 1159.08,196.62 " fill="none" id="C_0004474107085863083753&lt;-C_0003912506223772908750" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="1084.02,120.08,1085.3627,127.165,1092.4191,128.6506,1091.0764,121.5656,1084.02,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1132" y="156.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1142" y="163.0669">b1</text>
-    <path d="M1136.98,126.64 C1179.82,151.33 1226.56,178.26 1258.78,196.83 " fill="none" id="C_0000559263385732885469&lt;-C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1136.98,126.64 C1179.82,151.33 1226.56,178.26 1258.78,196.83 " fill="none" id="C_0004474107085863083753&lt;-C_0000113858899865604792" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="1125.6,120.08,1128.8056,126.5394,1136.001,126.0649,1132.7955,119.6054,1125.6,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1207" y="156.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="16" x="1217" y="163.0669">b2</text>
-    <path d="M770.25,116.82 C634.09,143.98 474.14,175.89 368.56,196.95 " fill="none" id="C_0000559263385732885469&lt;-C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M770.25,116.82 C634.09,143.98 474.14,175.89 368.56,196.95 " fill="none" id="C_0004474107085863083753&lt;-C_0011825915317057918032" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="783.35,114.2,776.6838,111.4501,771.5815,116.5458,778.2477,119.2957,783.35,114.2" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="598" y="156.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="608" y="163.0669">c1</text>
--- a/docs/test_cases/t00012_class_mermaid.svg
+++ b/docs/test_cases/t00012_class_mermaid.svg
@@ -174,8 +174,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11">
-          <g title="A" id="classId-C_0001773299890023132282-0" class="node default clickable">
+        <a transform="translate(219.55859375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11">
+          <g title="A" id="classId-C_0014186399120185058260-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"/>
            <line y2="39.5" y1="39.5" x2="103.1015625" x1="-103.1015625" class="divider"/>
@@ -203,8 +203,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16">
-          <g title="B" id="classId-C_0002061171077567279746-1" class="node default clickable">
+        <a transform="translate(590.2734375, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16">
+          <g title="B" id="classId-C_0016489368620538237973-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"/>
            <line y2="28.5" y1="28.5" x2="121.7578125" x1="-121.7578125" class="divider"/>
@@ -227,8 +227,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L20">
-          <g title="C" id="classId-C_0000627809578407650629-2" class="node default clickable">
+        <a transform="translate(1045.46875, 400.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L20">
+          <g title="C" id="classId-C_0005022476627261205034-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"/>
            <line y2="28.5" y1="28.5" x2="117.3125" x1="-117.3125" class="divider"/>
@@ -251,8 +251,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11">
-          <g title="A" id="classId-C_0000286972398942005457-3" class="node default clickable">
+        <a transform="translate(101.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11">
+          <g title="A" id="classId-C_0002295779191536043659-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"/>
            <line y2="17.5" y1="17.5" x2="93.28125" x1="-93.28125" class="divider"/>
@@ -270,8 +270,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L11">
-          <g title="A" id="classId-C_0000299466181098300963-4" class="node default clickable">
+        <a transform="translate(337.8359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L11">
+          <g title="A" id="classId-C_0002395729448786407708-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"/>
            <line y2="17.5" y1="17.5" x2="93.2734375" x1="-93.2734375" class="divider"/>
@@ -289,8 +289,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16">
-          <g title="B" id="classId-C_0000489063277971613593-5" class="node default clickable">
+        <a transform="translate(521.5234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16">
+          <g title="B" id="classId-C_0003912506223772908750-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"/>
            <line y2="17.5" y1="17.5" x2="40.4140625" x1="-40.4140625" class="divider"/>
@@ -308,8 +308,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L16">
-          <g title="B" id="classId-C_0000014232362483200599-6" class="node default clickable">
+        <a transform="translate(659.0234375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L16">
+          <g title="B" id="classId-C_0000113858899865604792-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"/>
            <line y2="17.5" y1="17.5" x2="47.0859375" x1="-47.0859375" class="divider"/>
@@ -327,8 +327,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L20">
-          <g title="C" id="classId-C_0001478239414632239754-7" class="node default clickable">
+        <a transform="translate(1045.46875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L20">
+          <g title="C" id="classId-C_0011825915317057918032-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"/>
            <line y2="17.5" y1="17.5" x2="289.359375" x1="-289.359375" class="divider"/>
@@ -346,8 +346,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00012/t00012.cc#L24">
-          <g title="R" id="classId-C_0000559263385732885469-8" class="node default clickable">
+        <a transform="translate(521.5234375, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00012/t00012.cc#L24">
+          <g title="R" id="classId-C_0004474107085863083753-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"/>
            <line y2="72.5" y1="72.5" x2="284.53125" x1="-284.53125" class="divider"/>
--- a/docs/test_cases/t00013.md
+++ b/docs/test_cases/t00013.md
@@ -96,7 +96,7 @@ private:
    {
      "bases": [],
      "display_name": "ABCD::F<T>",
-      "id": "952770730316239752",
+      "id": "7622165842529918021",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -138,7 +138,7 @@ private:
    {
      "bases": [],
      "display_name": "ABCD::F<int>",
-      "id": "2304215469403389354",
+      "id": "18433723755227114832",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -167,7 +167,7 @@ private:
    {
      "bases": [],
      "display_name": "A",
-      "id": "519995486237427479",
+      "id": "4159963889899419835",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -202,7 +202,7 @@ private:
    {
      "bases": [],
      "display_name": "B",
-      "id": "1177487653597650440",
+      "id": "9419901228781203525",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -237,7 +237,7 @@ private:
    {
      "bases": [],
      "display_name": "C",
-      "id": "1028245818073128358",
+      "id": "8225966544585026866",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -272,7 +272,7 @@ private:
    {
      "bases": [],
      "display_name": "D",
-      "id": "409373870621931875",
+      "id": "3274990964975455007",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -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"
        }
      ],
@@ -339,7 +341,7 @@ private:
    {
      "bases": [],
      "display_name": "E<T>",
-      "id": "864055993755439230",
+      "id": "6912447950043513847",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -381,7 +383,7 @@ private:
    {
      "bases": [],
      "display_name": "G<T,Args...>",
-      "id": "205927019127027617",
+      "id": "1647416153016220941",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -441,7 +443,7 @@ private:
    {
      "bases": [],
      "display_name": "E<int>",
-      "id": "1977486318799565722",
+      "id": "15819890550396525783",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -470,7 +472,7 @@ private:
    {
      "bases": [],
      "display_name": "G<int,float,std::string>",
-      "id": "1526733274613822014",
+      "id": "12213866196910576114",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -511,7 +513,7 @@ private:
    {
      "bases": [],
      "display_name": "E<std::string>",
-      "id": "531523220915557686",
+      "id": "4252185767324461489",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -540,7 +542,7 @@ private:
    {
      "bases": [],
      "display_name": "R",
-      "id": "2198686676355573844",
+      "id": "17589493410844590756",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -920,94 +958,106 @@ private:
  "relationships": [
    {
      "access": "public",
-      "destination": "952770730316239752",
-      "source": "2304215469403389354",
+      "destination": "7622165842529918021",
+      "source": "18433723755227114832",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2198686676355573844",
-      "source": "409373870621931875",
+      "destination": "17589493410844590756",
+      "source": "3274990964975455007",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "864055993755439230",
-      "source": "1977486318799565722",
+      "destination": "6912447950043513847",
+      "source": "15819890550396525783",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "205927019127027617",
-      "source": "1526733274613822014",
+      "destination": "1647416153016220941",
+      "source": "12213866196910576114",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "864055993755439230",
-      "source": "531523220915557686",
+      "destination": "6912447950043513847",
+      "source": "4252185767324461489",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "519995486237427479",
-      "source": "2198686676355573844",
+      "destination": "4159963889899419835",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1177487653597650440",
-      "source": "2198686676355573844",
+      "destination": "9419901228781203525",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1028245818073128358",
-      "source": "2198686676355573844",
+      "destination": "8225966544585026866",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "409373870621931875",
-      "source": "2198686676355573844",
+      "destination": "3274990964975455007",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1977486318799565722",
-      "source": "2198686676355573844",
+      "destination": "15819890550396525783",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "2304215469403389354",
-      "source": "2198686676355573844",
+      "destination": "6912447950043513847",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "864055993755439230",
-      "source": "2198686676355573844",
+      "destination": "18433723755227114832",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "952770730316239752",
-      "source": "2198686676355573844",
+      "destination": "7622165842529918021",
+      "source": "17589493410844590756",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1526733274613822014",
+      "destination": "6912447950043513847",
+      "source": "17589493410844590756",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "7622165842529918021",
+      "source": "17589493410844590756",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "12213866196910576114",
      "label": "gintstring",
-      "source": "2198686676355573844",
+      "source": "17589493410844590756",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "531523220915557686",
+      "destination": "4252185767324461489",
      "label": "estring",
-      "source": "2198686676355573844",
+      "source": "17589493410844590756",
      "type": "aggregation"
    }
  ],
--- 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="f10b0l0gvc2b6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1jr2971jnw5v1" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="60.8047" id="C_0007622165842529918021" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="48" id="C_0018433723755227114832" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="60.8047" id="C_0004159963889899419835" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="60.8047" id="C_0009419901228781203525" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="60.8047" id="C_0008225966544585026866" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="73.6094" id="C_0003274990964975455007" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L30" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L30" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="60.8047" id="C_0006912447950043513847" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="73.6094" id="C_0001647416153016220941" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="48" id="C_0015819890550396525783" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="48" id="C_0012213866196910576114" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="48" id="C_0004252185767324461489" 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,126 +174,126 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10b0l0gvc2b6)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jr2971jnw5v1)" height="214.4609" id="C_0017589493410844590756" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L45" xlink:show="new" xlink:title="get_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L45" target="_top" title="get_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L46" xlink:show="new" xlink:title="get_b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L46" target="_top" title="get_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L48" xlink:show="new" xlink:title="get_c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L48" target="_top" title="get_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L47" target="_top" title="get_const_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L49" xlink:show="new" xlink:title="get_d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L49" target="_top" title="get_d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L51" xlink:show="new" xlink:title="get_d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L51" target="_top" title="get_d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L54" target="_top" title="get_int_e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L55" target="_top" title="get_int_e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L58" target="_top" title="get_int_f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M270.09,360.17 C260.11,377.41 246.14,401.53 233.84,422.78 " fill="none" id="C_0018433723755227114832-&gt;C_0007622165842529918021" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="239.89,426.3,223.81,440.1,227.77,419.28,239.89,426.3" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M115.49,298.63 C132.68,282.78 152.34,264.91 172.5,252 C232.6,213.53 305.37,182.56 366.43,159.94 " fill="none" id="C_0000409373870621931875-&gt;C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M115.49,298.63 C132.68,282.78 152.34,264.91 172.5,252 C232.6,213.53 305.37,182.56 366.43,159.94 " fill="none" id="C_0003274990964975455007-&gt;C_0017589493410844590756" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="371.17,158.19,361.3418,157.5521,366.479,159.9205,364.1106,165.0577,371.17,158.19" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M371.44,147.45 C299.82,170.53 209.55,205.88 137.5,252 C118.91,263.9 100.75,280.02 86.98,294.88 " fill="none" id="C_0002198686676355573844-&gt;C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M371.44,147.45 C299.82,170.53 209.55,205.88 137.5,252 C118.91,263.9 100.75,280.02 86.98,294.88 " fill="none" id="C_0017589493410844590756-&gt;C_0003274990964975455007" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="83.58,298.63,92.5908,294.6543,86.9405,294.9277,86.6671,289.2775,83.58,298.63" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M821.5,360.17 C821.5,376.63 821.5,399.36 821.5,419.88 " fill="none" id="C_0001977486318799565722-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M821.5,360.17 C821.5,376.63 821.5,399.36 821.5,419.88 " fill="none" id="C_0015819890550396525783-&gt;C_0006912447950043513847" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="828.5,420.1,821.5,440.1,814.5,420.1,828.5,420.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1037.5,360.17 C1037.5,375.01 1037.5,394.95 1037.5,413.77 " fill="none" id="C_0001526733274613822014-&gt;C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M1037.5,360.17 C1037.5,375.01 1037.5,394.95 1037.5,413.77 " fill="none" id="C_0012213866196910576114-&gt;C_0001647416153016220941" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="1044.5,413.83,1037.5,433.83,1030.5,413.83,1044.5,413.83" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M724.05,360.17 C739.99,378.13 762.57,403.57 781.97,425.45 " fill="none" id="C_0000531523220915557686-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M724.05,360.17 C739.99,378.13 762.57,403.57 781.97,425.45 " fill="none" id="C_0004252185767324461489-&gt;C_0006912447950043513847" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="787.37,420.98,795.4,440.59,776.89,430.27,787.37,420.98" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M446.88,222.29 C434.7,250.66 422.4,279.32 413.25,300.64 " fill="none" id="C_0002198686676355573844-&gt;C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M446.88,222.29 C434.7,250.66 422.4,279.32 413.25,300.64 " fill="none" id="C_0017589493410844590756-&gt;C_0004159963889899419835" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="411.23,305.34,418.4519,298.6434,413.1996,300.7443,411.0987,295.492,411.23,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M492.5,222.29 C492.5,250.42 492.5,278.84 492.5,300.1 " fill="none" id="C_0002198686676355573844-&gt;C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M492.5,222.29 C492.5,250.42 492.5,278.84 492.5,300.1 " fill="none" id="C_0017589493410844590756-&gt;C_0009419901228781203525" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="492.5,305.34,496.5,296.34,492.5,300.34,488.5,296.34,492.5,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M538.12,222.29 C550.3,250.66 562.6,279.32 571.75,300.64 " fill="none" id="C_0002198686676355573844-&gt;C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M538.12,222.29 C550.3,250.66 562.6,279.32 571.75,300.64 " fill="none" id="C_0017589493410844590756-&gt;C_0008225966544585026866" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="573.77,305.34,573.9013,295.492,571.8004,300.7443,566.5481,298.6434,573.77,305.34" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M613.67,192.38 C663.67,224.55 721.88,262.85 773.5,299 C777.94,302.11 782.56,305.45 787.11,308.78 " fill="none" id="C_0002198686676355573844-&gt;C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M613.67,192.38 C663.67,224.55 721.88,262.85 773.5,299 C777.94,302.11 782.56,305.45 787.11,308.78 " fill="none" id="C_0017589493410844590756-&gt;C_0015819890550396525783" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="791.25,311.84,786.396,303.2704,787.2312,308.8652,781.6363,309.7005,791.25,311.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M391.06,222.29 C360.58,254.23 329.76,286.53 308.97,308.32 " fill="none" id="C_0002198686676355573844-&gt;C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="305.46,311.99,314.5716,308.2511,308.9161,308.3768,308.7904,302.7213,305.46,311.99" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M613.6,139.54 C701.02,163.54 813.06,210.37 868.5,299 C895.25,341.77 868.51,399.83 845.79,436.1 " fill="none" id="C_0002198686676355573844-&gt;C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M613.6,139.54 C701.02,163.54 813.06,210.37 868.5,299 C895.25,341.77 868.51,399.83 845.79,436.1 " fill="none" id="C_0017589493410844590756-&gt;C_0006912447950043513847" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="843.04,440.41,851.2501,434.9699,845.7272,436.1935,844.5036,430.6705,843.04,440.41" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M371.19,164.68 C313.65,194.46 250.07,238.59 215.5,299 C191.5,340.93 194.35,398.53 199.62,435.01 " fill="none" id="C_0002198686676355573844-&gt;C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M391.06,222.29 C360.58,254.23 329.76,286.53 308.97,308.32 " fill="none" id="C_0017589493410844590756-&gt;C_0018433723755227114832" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="305.46,311.99,314.5716,308.2511,308.9161,308.3768,308.7904,302.7213,305.46,311.99" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M371.19,164.68 C313.65,194.46 250.07,238.59 215.5,299 C191.5,340.93 194.35,398.53 199.62,435.01 " fill="none" id="C_0017589493410844590756-&gt;C_0007622165842529918021" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="200.42,440.24,203.0112,430.7381,199.6629,435.2976,195.1034,431.9494,200.42,440.24" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M626.37,144.32 C715.69,166.35 833.99,201.71 930.5,252 C961.36,268.08 992.3,293.31 1012.91,311.73 " fill="none" id="C_0002198686676355573844&lt;-C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M626.37,144.32 C715.69,166.35 833.99,201.71 930.5,252 C961.36,268.08 992.3,293.31 1012.91,311.73 " fill="none" id="C_0017589493410844590756&lt;-C_0012213866196910576114" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="613.69,141.23,618.5761,146.5334,625.3508,144.0629,620.4647,138.7595,613.69,141.23" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="962.5" cy="261.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="60" x="969.5" y="265.0669">gintstring</text>
-    <path d="M604.06,231.79 C633.53,262.38 662.36,292.3 681.33,311.99 " fill="none" id="C_0002198686676355573844&lt;-C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M604.06,231.79 C633.53,262.38 662.36,292.3 681.33,311.99 " fill="none" id="C_0017589493410844590756&lt;-C_0004252185767324461489" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="594.91,222.29,596.1866,229.3872,603.2289,230.9385,601.9523,223.8413,594.91,222.29" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="638.5" y="258.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="44" x="648.5" y="265.0669">estring</text>
--- a/docs/test_cases/t00013_class_mermaid.svg
+++ b/docs/test_cases/t00013_class_mermaid.svg
@@ -60,8 +60,8 @@
        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M403.82730763381994,502L399.88343344484997,507.6666666666667C395.93955925587994,513.3333333333334,388.05181087794,524.6666666666666,384.10793668897,536C380.1640625,547.3333333333334,380.1640625,558.6666666666666,380.1640625,564.3333333333334L380.1640625,570"/>
        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id9" d="M531.9152353689567,159L532.1272794741307,154.83333333333334C532.3393235793045,150.66666666666666,532.7634117896522,142.33333333333334,532.4235795151352,134C532.0837472406181,125.66666666666667,530.9799944812362,117.33333333333333,530.4281181015452,113.16666666666667L529.8762417218543,109"/>
        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M393.625,385.5976816374042L334.6796875,410.6647346978368C275.734375,435.7317877582695,157.84375,485.8658938791347,98.8984375,518.4329469395674C39.953125,551,39.953125,566,39.953125,573.5L39.953125,581"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M652.75,469.4040961891176L663.1028645833334,480.50341349093134C673.4557291666666,491.60273079274504,694.1614583333334,513.8013653963725,704.5143229166666,532.4006826981863C714.8671875,551,714.8671875,566,714.8671875,573.5L714.8671875,581"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M603.9171608880779,502L606.5846132400649,507.6666666666667C609.252065592052,513.3333333333334,614.5869702960259,524.6666666666666,617.254422648013,542.5833333333334C619.921875,560.5,619.921875,585,619.921875,608C619.921875,631,619.921875,652.5,608.4713541666666,672.1869918699186C597.0208333333334,691.8739837398374,574.1197916666666,709.7479674796747,562.6692708333334,718.6849593495936L551.21875,727.6219512195122"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M603.9171608880779,502L606.5846132400649,507.6666666666667C609.252065592052,513.3333333333334,614.5869702960259,524.6666666666666,617.254422648013,542.5833333333334C619.921875,560.5,619.921875,585,619.921875,608C619.921875,631,619.921875,652.5,608.4713541666666,672.1869918699186C597.0208333333334,691.8739837398374,574.1197916666666,709.7479674796747,562.6692708333334,718.6849593495936L551.21875,727.6219512195122"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id12" d="M652.75,469.4040961891176L663.1028645833334,480.50341349093134C673.4557291666666,491.60273079274504,694.1614583333334,513.8013653963725,704.5143229166666,532.4006826981863C714.8671875,551,714.8671875,566,714.8671875,573.5L714.8671875,581"/>
        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M652.75,423.3917357174008L678.9270833333334,442.1597797645007C705.1041666666666,460.92782381160055,757.4583333333334,498.46391190580033,783.6354166666666,529.4819559529002C809.8125,560.5,809.8125,585,809.8125,608C809.8125,631,809.8125,652.5,806.039838576159,669.25C802.2671771523179,686,794.7218543046357,698,790.9491928807947,704L787.1765314569536,710"/>
        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id14" d="M652.75,389.25173685934453L706.6861979166666,413.7097807161204C760.6223958333334,438.16782457289634,868.4947916666666,487.08391228644814,922.4309895833334,519.0419561432241C976.3671875,551,976.3671875,566,976.3671875,573.5L976.3671875,581"/>
        <path marker-start="url(#classDiagram-aggregationStart)" style="fill:none" class="edge-pattern-solid relation" id="id15" d="M523.1875,502L523.1875,507.6666666666667C523.1875,513.3333333333334,523.1875,524.6666666666666,523.1875,537.8333333333334C523.1875,551,523.1875,566,523.1875,573.5L523.1875,581"/>
@@ -234,8 +234,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L7">
-          <g title="F" id="classId-C_0000952770730316239752-0" class="node default clickable">
+        <a transform="translate(762.33984375, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L7">
+          <g title="F" id="classId-C_0007622165842529918021-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"/>
            <line y2="28.5" y1="28.5" x2="55.0546875" x1="-55.0546875" class="divider"/>
@@ -258,8 +258,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L7">
-          <g title="F" id="classId-C_0002304215469403389354-1" class="node default clickable">
+        <a transform="translate(714.8671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L7">
+          <g title="F" id="classId-C_0018433723755227114832-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"/>
            <line y2="17.5" y1="17.5" x2="59.9453125" x1="-59.9453125" class="divider"/>
@@ -277,8 +277,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L14">
-          <g title="A" id="classId-C_0000519995486237427479-2" class="node default clickable">
+        <a transform="translate(153.6484375, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L14">
+          <g title="A" id="classId-C_0004159963889899419835-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"/>
            <line y2="28.5" y1="28.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -301,8 +301,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L18">
-          <g title="B" id="classId-C_0001177487653597650440-3" class="node default clickable">
+        <a transform="translate(267.1328125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L18">
+          <g title="B" id="classId-C_0009419901228781203525-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"/>
            <line y2="28.5" y1="28.5" x2="31.7421875" x1="-31.7421875" class="divider"/>
@@ -325,8 +325,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L22">
-          <g title="C" id="classId-C_0001028245818073128358-4" class="node default clickable">
+        <a transform="translate(380.1640625, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L22">
+          <g title="C" id="classId-C_0008225966544585026866-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"/>
            <line y2="28.5" y1="28.5" x2="31.2890625" x1="-31.2890625" class="divider"/>
@@ -349,8 +349,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L28">
-          <g title="D" id="classId-C_0000409373870621931875-5" class="node default clickable">
+        <a transform="translate(523.1875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L28">
+          <g title="D" id="classId-C_0003274990964975455007-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"/>
            <line y2="17.5" y1="17.5" x2="70.40625" x1="-70.40625" class="divider"/>
@@ -378,8 +378,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33">
-          <g title="E" id="classId-C_0000864055993755439230-6" class="node default clickable">
+        <a transform="translate(523.1875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33">
+          <g title="E" id="classId-C_0006912447950043513847-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"/>
            <line y2="28.5" y1="28.5" x2="28.03125" x1="-28.03125" class="divider"/>
@@ -402,8 +402,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L37">
-          <g title="G" id="classId-C_0000205927019127027617-7" class="node default clickable">
+        <a transform="translate(976.3671875, 749.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L37">
+          <g title="G" id="classId-C_0001647416153016220941-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"/>
            <line y2="39.5" y1="39.5" x2="99.328125" x1="-99.328125" class="divider"/>
@@ -431,8 +431,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33">
-          <g title="E" id="classId-C_0001977486318799565722-8" class="node default clickable">
+        <a transform="translate(39.953125, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33">
+          <g title="E" id="classId-C_0015819890550396525783-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"/>
            <line y2="17.5" y1="17.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -450,8 +450,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L37">
-          <g title="G" id="classId-C_0001526733274613822014-9" class="node default clickable">
+        <a transform="translate(976.3671875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L37">
+          <g title="G" id="classId-C_0012213866196910576114-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"/>
            <line y2="17.5" y1="17.5" x2="93.7265625" x1="-93.7265625" class="divider"/>
@@ -469,8 +469,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L33">
-          <g title="E" id="classId-C_0000531523220915557686-10" class="node default clickable">
+        <a transform="translate(523.1875, 609.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L33">
+          <g title="E" id="classId-C_0004252185767324461489-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"/>
            <line y2="17.5" y1="17.5" x2="61.734375" x1="-61.734375" class="divider"/>
@@ -488,8 +488,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00013/t00013.cc#L43">
-          <g title="R" id="classId-C_0002198686676355573844-11" class="node default clickable">
+        <a transform="translate(523.1875, 330.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00013/t00013.cc#L43">
+          <g title="R" id="classId-C_0017589493410844590756-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"/>
            <line y2="-81.5" y1="-81.5" x2="129.5625" x1="-129.5625" class="divider"/>
--- a/docs/test_cases/t00014.md
+++ b/docs/test_cases/t00014.md
@@ -116,7 +116,7 @@ public:
    {
      "bases": [],
      "display_name": "A<T,P>",
-      "id": "765890579167335652",
+      "id": "6127124633338685220",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -176,7 +176,7 @@ public:
    {
      "bases": [],
      "display_name": "B",
-      "id": "934136012292043506",
+      "id": "7473088098336348050",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -211,7 +211,7 @@ public:
    {
      "bases": [],
      "display_name": "A<T,std::string>",
-      "id": "2186387853087008570",
+      "id": "17491102824696068567",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -246,7 +246,7 @@ public:
    {
      "bases": [],
      "display_name": "A<T,std::unique_ptr<std::string>>",
-      "id": "947292733740993297",
+      "id": "7578341869927946377",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -288,7 +288,7 @@ public:
    {
      "bases": [],
      "display_name": "A<long,T>",
-      "id": "1700006390494465667",
+      "id": "13600051123955725337",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -323,7 +323,7 @@ public:
    {
      "bases": [],
      "display_name": "A<double,T>",
-      "id": "2017665567517853203",
+      "id": "16141324540142825631",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -358,7 +358,7 @@ public:
    {
      "bases": [],
      "display_name": "A<long,U>",
-      "id": "906557320263235873",
+      "id": "7252458562105886987",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -393,7 +393,7 @@ public:
    {
      "bases": [],
      "display_name": "A<long,bool>",
-      "id": "378898020828430636",
+      "id": "3031184166627445092",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -428,7 +428,7 @@ public:
    {
      "bases": [],
      "display_name": "A<double,bool>",
-      "id": "2082013375525130414",
+      "id": "16656107004201043317",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -463,7 +463,7 @@ public:
    {
      "bases": [],
      "display_name": "A<long,float>",
-      "id": "51978493292659230",
+      "id": "415827946341273846",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -498,7 +498,7 @@ public:
    {
      "bases": [],
      "display_name": "A<double,float>",
-      "id": "197769253782961588",
+      "id": "1582154030263692708",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -533,7 +533,7 @@ public:
    {
      "bases": [],
      "display_name": "A<bool,std::string>",
-      "id": "895940711566401184",
+      "id": "7167525692531209473",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -568,7 +568,7 @@ public:
    {
      "bases": [],
      "display_name": "A<float,std::unique_ptr<std::string>>",
-      "id": "1751732625010742161",
+      "id": "14013861000085937293",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -610,7 +610,7 @@ public:
    {
      "bases": [],
      "display_name": "A<int,std::string>",
-      "id": "887121441210847583",
+      "id": "7096971529686780666",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -645,7 +645,7 @@ public:
    {
      "bases": [],
      "display_name": "A<std::string,std::string>",
-      "id": "1119452495635561975",
+      "id": "8955619965084495806",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -680,7 +680,7 @@ public:
    {
      "bases": [],
      "display_name": "A<char,std::string>",
-      "id": "340562099063642390",
+      "id": "2724496792509139121",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -715,7 +715,7 @@ public:
    {
      "bases": [],
      "display_name": "A<wchar_t,std::string>",
-      "id": "1388877149159894665",
+      "id": "11111017193279157322",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -750,7 +750,7 @@ public:
    {
      "bases": [],
      "display_name": "R<T>",
-      "id": "1758213171584933144",
+      "id": "14065705372679465152",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -975,230 +975,230 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "765890579167335652",
-      "source": "2186387853087008570",
+      "destination": "6127124633338685220",
+      "source": "17491102824696068567",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "765890579167335652",
-      "source": "947292733740993297",
+      "destination": "6127124633338685220",
+      "source": "7578341869927946377",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "765890579167335652",
-      "source": "1700006390494465667",
+      "destination": "6127124633338685220",
+      "source": "13600051123955725337",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "765890579167335652",
-      "source": "2017665567517853203",
+      "destination": "6127124633338685220",
+      "source": "16141324540142825631",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1700006390494465667",
-      "source": "906557320263235873",
+      "destination": "13600051123955725337",
+      "source": "7252458562105886987",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1700006390494465667",
-      "source": "378898020828430636",
+      "destination": "13600051123955725337",
+      "source": "3031184166627445092",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2017665567517853203",
-      "source": "2082013375525130414",
+      "destination": "16141324540142825631",
+      "source": "16656107004201043317",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1700006390494465667",
-      "source": "51978493292659230",
+      "destination": "13600051123955725337",
+      "source": "415827946341273846",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2017665567517853203",
-      "source": "197769253782961588",
+      "destination": "16141324540142825631",
+      "source": "1582154030263692708",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2186387853087008570",
-      "source": "895940711566401184",
+      "destination": "17491102824696068567",
+      "source": "7167525692531209473",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "947292733740993297",
-      "source": "1751732625010742161",
+      "destination": "7578341869927946377",
+      "source": "14013861000085937293",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2186387853087008570",
-      "source": "887121441210847583",
+      "destination": "17491102824696068567",
+      "source": "7096971529686780666",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2186387853087008570",
-      "source": "1119452495635561975",
+      "destination": "17491102824696068567",
+      "source": "8955619965084495806",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2186387853087008570",
-      "source": "340562099063642390",
+      "destination": "17491102824696068567",
+      "source": "2724496792509139121",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2186387853087008570",
-      "source": "1388877149159894665",
+      "destination": "17491102824696068567",
+      "source": "11111017193279157322",
      "type": "instantiation"
    },
    {
      "access": "private",
-      "destination": "934136012292043506",
+      "destination": "7473088098336348050",
      "label": "bapair",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "378898020828430636",
+      "destination": "3031184166627445092",
      "label": "bapair",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "2082013375525130414",
+      "destination": "16656107004201043317",
      "label": "abool",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "2082013375525130414",
+      "destination": "16656107004201043317",
      "label": "aboolfloat",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "51978493292659230",
+      "destination": "415827946341273846",
      "label": "aboolfloat",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "197769253782961588",
+      "destination": "1582154030263692708",
      "label": "afloat",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "895940711566401184",
+      "destination": "7167525692531209473",
      "label": "boolstring",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1751732625010742161",
+      "destination": "14013861000085937293",
      "label": "floatstring",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "887121441210847583",
+      "destination": "7096971529686780666",
      "label": "intstring",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1119452495635561975",
+      "destination": "8955619965084495806",
      "label": "stringstring",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1119452495635561975",
+      "destination": "8955619965084495806",
      "label": "bstringstring",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "2017665567517853203",
+      "destination": "16141324540142825631",
      "label": "atfloat",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "51978493292659230",
+      "destination": "415827946341273846",
      "label": "atfloat",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "protected",
-      "destination": "934136012292043506",
+      "destination": "7473088098336348050",
      "label": "bs",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "934136012292043506",
+      "destination": "7473088098336348050",
      "label": "bs2",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "340562099063642390",
-      "source": "1758213171584933144",
+      "destination": "2724496792509139121",
+      "source": "14065705372679465152",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "340562099063642390",
+      "destination": "2724496792509139121",
      "label": "cb",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1388877149159894665",
-      "source": "1758213171584933144",
+      "destination": "11111017193279157322",
+      "source": "14065705372679465152",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1388877149159894665",
+      "destination": "11111017193279157322",
      "label": "gcb",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "934136012292043506",
+      "destination": "7473088098336348050",
      "label": "vps",
-      "source": "1758213171584933144",
+      "source": "14065705372679465152",
      "type": "aggregation"
    }
  ],
--- 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="f1mjz46tmqwj90" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f157hk5logk2l6" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="73.6094" id="C_0006127124633338685220" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="60.8047" id="C_0007473088098336348050" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0017491102824696068567" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0007578341869927946377" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0013600051123955725337" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0016141324540142825631" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0007252458562105886987" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L34" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L34" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0003031184166627445092" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L37" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L37" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0016656107004201043317" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L41" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L41" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0000415827946341273846" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L38" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L38" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0001582154030263692708" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0007167525692531209473" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L31" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L31" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0014013861000085937293" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0007096971529686780666" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0008955619965084495806" 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(#f1mjz46tmqwj90)" height="48" id="C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="461" y="1083"/>
+    <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0002724496792509139121" 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(#f1mjz46tmqwj90)" height="48" id="C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="450.5" y="834"/>
+    <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="48" id="C_0011111017193279157322" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mjz46tmqwj90)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L56" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L56" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f157hk5logk2l6)" height="252.875" id="C_0014065705372679465152" 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,221 +204,221 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L61" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L62" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L63" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L69" xlink:show="new" xlink:title="atfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L69" target="_top" title="atfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L59" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L59" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L64" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L72" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L72" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L75" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L68" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L68" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L76" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L65" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L77" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L66" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L67" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L78" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L78" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L79" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L79" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M852.1,869.74 C884.92,826.94 953.84,737.07 998.19,679.23 " fill="none" id="C_0017491102824696068567-&gt;C_0006127124633338685220" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="992.82,674.72,1010.55,663.11,1003.93,683.24,992.82,674.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M930.23,652.99 C950.73,647.91 971.56,642.74 989.42,638.3 " fill="none" id="C_0000947292733740993297-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M930.23,652.99 C950.73,647.91 971.56,642.74 989.42,638.3 " fill="none" id="C_0007578341869927946377-&gt;C_0006127124633338685220" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="987.74,631.51,1008.83,633.49,991.11,645.1,987.74,631.51" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M873.61,567.25 C906.96,579.1 954.56,596 990.13,608.64 " fill="none" id="C_0001700006390494465667-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M873.61,567.25 C906.96,579.1 954.56,596 990.13,608.64 " fill="none" id="C_0013600051123955725337-&gt;C_0006127124633338685220" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="992.49,602.05,1008.99,615.34,987.8,615.24,992.49,602.05" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M849.63,343.09 C882.46,392.14 957.77,504.65 1002.9,572.07 " fill="none" id="C_0002017665567517853203-&gt;C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M849.63,343.09 C882.46,392.14 957.77,504.65 1002.9,572.07 " fill="none" id="C_0016141324540142825631-&gt;C_0006127124633338685220" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="1008.92,568.47,1014.22,588.99,997.28,576.26,1008.92,568.47" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M572.15,601.33 C623.66,591.73 712.28,575.22 771.38,564.2 " fill="none" id="C_0000906557320263235873-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M572.15,601.33 C623.66,591.73 712.28,575.22 771.38,564.2 " fill="none" id="C_0007252458562105886987-&gt;C_0013600051123955725337" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="770.38,557.27,791.32,560.49,772.94,571.03,770.38,557.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M581.3,530.52 C633.59,535.22 715.46,542.57 771.2,547.58 " fill="none" id="C_0000378898020828430636-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M581.3,530.52 C633.59,535.22 715.46,542.57 771.2,547.58 " fill="none" id="C_0003031184166627445092-&gt;C_0013600051123955725337" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="771.87,540.61,791.16,549.38,770.62,554.56,771.87,540.61" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M589.3,285.15 C639.06,292.1 710.69,302.11 763.14,309.45 " fill="none" id="C_0002082013375525130414-&gt;C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M589.3,285.15 C639.06,292.1 710.69,302.11 763.14,309.45 " fill="none" id="C_0016656107004201043317-&gt;C_0016141324540142825631" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="764.44,302.56,783.27,312.26,762.5,316.42,764.44,302.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M581.71,458.9 C604.52,466.24 631.72,475.25 656,484 C695.14,498.1 738.66,515.2 772.57,528.85 " fill="none" id="C_0000051978493292659230-&gt;C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M581.71,458.9 C604.52,466.24 631.72,475.25 656,484 C695.14,498.1 738.66,515.2 772.57,528.85 " fill="none" id="C_0000415827946341273846-&gt;C_0013600051123955725337" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="775.41,522.45,791.32,536.44,770.16,535.42,775.41,522.45" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M589.65,352 C639.45,345.2 710.96,335.45 763.31,328.3 " fill="none" id="C_0000197769253782961588-&gt;C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M589.65,352 C639.45,345.2 710.96,335.45 763.31,328.3 " fill="none" id="C_0001582154030263692708-&gt;C_0016141324540142825631" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="762.63,321.33,783.39,325.56,764.52,335.2,762.63,321.33" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M598.58,795.78 C617.32,801.92 637.56,808.9 656,816 C691.6,829.71 730.43,846.74 762.49,861.39 " fill="none" id="C_0000895940711566401184-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M598.58,795.78 C617.32,801.92 637.56,808.9 656,816 C691.6,829.71 730.43,846.74 762.49,861.39 " fill="none" id="C_0007167525692531209473-&gt;C_0017491102824696068567" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="765.77,855.19,781,869.92,759.91,867.91,765.77,855.19" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M656.26,685.75 C669.52,685.09 683.05,684.41 696.42,683.74 " fill="none" id="C_0001751732625010742161-&gt;C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M656.26,685.75 C669.52,685.09 683.05,684.41 696.42,683.74 " fill="none" id="C_0014013861000085937293-&gt;C_0007578341869927946377" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="696.2,676.75,716.52,682.74,696.9,690.73,696.2,676.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M593.26,931.26 C639.95,923.96 704.14,913.92 754.13,906.1 " fill="none" id="C_0000887121441210847583-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M593.26,931.26 C639.95,923.96 704.14,913.92 754.13,906.1 " fill="none" id="C_0007096971529686780666-&gt;C_0017491102824696068567" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="753.06,899.18,773.9,903.01,755.22,913.02,753.06,899.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M608.31,999.92 C624.24,994.43 640.78,988.33 656,982 C694.58,965.94 736.47,945.07 769.64,927.69 " fill="none" id="C_0001119452495635561975-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M608.31,999.92 C624.24,994.43 640.78,988.33 656,982 C694.58,965.94 736.47,945.07 769.64,927.69 " fill="none" id="C_0008955619965084495806-&gt;C_0017491102824696068567" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="766.63,921.36,787.58,918.19,773.19,933.74,766.63,921.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M599.31,1090.15 C618.43,1083.84 638.71,1075.56 656,1065 C713.85,1029.67 767.67,972.08 800.07,933.62 " fill="none" id="C_0000340562099063642390-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M599.31,1090.15 C618.43,1083.84 638.71,1075.56 656,1065 C713.85,1029.67 767.67,972.08 800.07,933.62 " fill="none" id="C_0002724496792509139121-&gt;C_0017491102824696068567" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="794.67,929.17,812.79,918.19,805.47,938.07,794.67,929.17" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M609.56,867.41 C654,872.74 709.36,879.37 753.67,884.68 " fill="none" id="C_0001388877149159894665-&gt;C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M609.56,867.41 C654,872.74 709.36,879.37 753.67,884.68 " fill="none" id="C_0011111017193279157322-&gt;C_0017491102824696068567" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="754.79,877.76,773.81,887.09,753.12,891.66,754.79,877.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M153.36,394.42 C179,265.78 223.46,88.66 280,47 C334.65,6.73 414.78,28.3 469.27,51.43 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M153.36,394.42 C179,265.78 223.46,88.66 280,47 C334.65,6.73 414.78,28.3 469.27,51.43 " fill="none" id="C_0014065705372679465152&lt;-C_0007473088098336348050" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="150.79,407.5,155.8747,402.3867,153.1104,395.7265,148.0257,400.8398,150.79,407.5" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="303" y="14.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="40" x="313" y="21.0669">bapair</text>
-    <path d="M139.5,394.41 C154.71,297.07 191.51,172.76 280,104 C308.06,82.2 402.1,79.29 466.23,80.02 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M139.5,394.41 C154.71,297.07 191.51,172.76 280,104 C308.06,82.2 402.1,79.29 466.23,80.02 " fill="none" id="C_0014065705372679465152&lt;-C_0007473088098336348050-1" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="137.58,407.35,142.4142,401.9992,139.3343,395.4789,134.5001,400.8297,137.58,407.35" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="318.5,70.0664,322.5,74.0664,318.5,78.0664,314.5,74.0664" style="stroke: #B38D22; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="325.5" y="79.0669">bs</text>
-    <path d="M154.98,394.13 C176.27,315.85 214.06,222.02 280,161 C283.56,157.7 393.78,123.47 466.37,101.16 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-2" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M154.98,394.13 C176.27,315.85 214.06,222.02 280,161 C283.56,157.7 393.78,123.47 466.37,101.16 " fill="none" id="C_0014065705372679465152&lt;-C_0007473088098336348050-2" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="151.58,407.06,156.9774,402.2779,154.6391,395.4565,149.2417,400.2385,151.58,407.06" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="314.5" cy="124.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="321.5" y="128.0669">bs2</text>
-    <path d="M168.06,395.16 C191.62,333.59 227.49,264.67 280,218 C312.99,188.68 336.14,208.67 374,186 C389.65,176.63 389.47,169.02 404,158 C425.66,141.58 451.05,125.61 473.27,112.58 " fill="none" id="C_0001758213171584933144&lt;-C_0000934136012292043506-3" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M168.06,395.16 C191.62,333.59 227.49,264.67 280,218 C312.99,188.68 336.14,208.67 374,186 C389.65,176.63 389.47,169.02 404,158 C425.66,141.58 451.05,125.61 473.27,112.58 " fill="none" id="C_0014065705372679465152&lt;-C_0007473088098336348050-3" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="163.51,407.37,169.3539,403.1452,167.7018,396.1259,161.8579,400.3507,163.51,407.37" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="315" cy="178.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="22" x="322" y="182.0669">vps</text>
-    <path d="M263.37,563.02 C268.97,563.78 274.53,564.44 280,565 C321.56,569.22 332.54,570.14 374,565 C409.66,560.58 448.91,550.65 478.99,541.92 " fill="none" id="C_0001758213171584933144&lt;-C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M263.37,563.02 C268.97,563.78 274.53,564.44 280,565 C321.56,569.22 332.54,570.14 374,565 C409.66,560.58 448.91,550.65 478.99,541.92 " fill="none" id="C_0014065705372679465152&lt;-C_0003031184166627445092" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="250.23,561.11,255.592,565.9317,262.1051,562.8366,256.7431,558.0149,250.23,561.11" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="303" y="554.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="40" x="313" y="561.0669">bapair</text>
-    <path d="M199.24,396.4 C221.13,365.53 248.08,336.02 280,316 C337.73,279.79 417.38,273.2 470.91,273.6 " fill="none" id="C_0001758213171584933144&lt;-C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M199.24,396.4 C221.13,365.53 248.08,336.02 280,316 C337.73,279.79 417.38,273.2 470.91,273.6 " fill="none" id="C_0014065705372679465152&lt;-C_0016656107004201043317" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="191.71,407.37,198.4038,404.6881,198.5027,397.4777,191.8089,400.1596,191.71,407.37" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="305.5" y="272.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="315.5" y="279.0669">abool</text>
-    <path d="M260.36,401.68 C266.86,396.55 273.42,391.63 280,387 C318.03,360.22 334.46,365.49 374,341 C388.28,332.15 389.14,325.84 404,318 C424.81,307.02 449.1,298.24 470.72,291.67 " fill="none" id="C_0001758213171584933144&lt;-C_0002082013375525130414-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M260.36,401.68 C266.86,396.55 273.42,391.63 280,387 C318.03,360.22 334.46,365.49 374,341 C388.28,332.15 389.14,325.84 404,318 C424.81,307.02 449.1,298.24 470.72,291.67 " fill="none" id="C_0014065705372679465152&lt;-C_0016656107004201043317-1" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="250.21,409.89,257.3909,409.2308,259.5443,402.3487,252.3634,403.0079,250.21,409.89" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="330.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="337.0669">aboolfloat</text>
-    <path d="M263.07,533.5 C300.07,529.73 339.5,522.19 374,508 C389.79,501.5 388.98,492.12 404,484 C427.2,471.45 454.91,461.88 478.34,455.15 " fill="none" id="C_0001758213171584933144&lt;-C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M263.07,533.5 C300.07,529.73 339.5,522.19 374,508 C389.79,501.5 388.98,492.12 404,484 C427.2,471.45 454.91,461.88 478.34,455.15 " fill="none" id="C_0014065705372679465152&lt;-C_0000415827946341273846" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="250.1,534.69,256.4396,538.1266,262.0501,533.5964,255.7105,530.1599,250.1,534.69" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="497.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="504.0669">aboolfloat</text>
-    <path d="M262.87,491.36 C268.64,489.83 274.37,488.37 280,487 C347.83,470.52 427.45,457.54 478.06,450.07 " fill="none" id="C_0001758213171584933144&lt;-C_0000051978493292659230-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M262.87,491.36 C268.64,489.83 274.37,488.37 280,487 C347.83,470.52 427.45,457.54 478.06,450.07 " fill="none" id="C_0014065705372679465152&lt;-C_0000415827946341273846-1" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="250.19,494.81,257.03,497.0936,261.7687,491.6582,254.9287,489.3745,250.19,494.81" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="302.5" y="458.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="312.5" y="465.0669">atfloat</text>
-    <path d="M250.23,458.89 C260.18,453.61 270.18,448.57 280,444 C332.88,419.38 348.73,419.65 404,401 C423.95,394.27 445.74,387.07 465.46,380.61 " fill="none" id="C_0001758213171584933144-&gt;C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M250.23,458.89 C260.18,453.61 270.18,448.57 280,444 C332.88,419.38 348.73,419.65 404,401 C423.95,394.27 445.74,387.07 465.46,380.61 " fill="none" id="C_0014065705372679465152-&gt;C_0001582154030263692708" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="470.43,378.99,460.6313,377.997,465.6795,380.5497,463.1268,385.5978,470.43,378.99" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="305" y="401.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="36" x="315" y="408.0669">afloat</text>
-    <path d="M260.78,650.18 C267.19,654.96 273.62,659.6 280,664 C319.12,690.99 332.72,691.43 374,715 C387.5,722.71 389.88,726.49 404,733 C422.19,741.39 442.55,748.95 461.47,755.27 " fill="none" id="C_0001758213171584933144&lt;-C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M260.78,650.18 C267.19,654.96 273.62,659.6 280,664 C319.12,690.99 332.72,691.43 374,715 C387.5,722.71 389.88,726.49 404,733 C422.19,741.39 442.55,748.95 461.47,755.27 " fill="none" id="C_0014065705372679465152&lt;-C_0007167525692531209473" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="250.02,642,252.3721,648.8167,259.5691,649.2674,257.217,642.4506,250.02,642" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291.5" y="653.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="63" x="301.5" y="660.0669">boolstring</text>
-    <path d="M262.21,592.56 C306.98,611.61 357.39,632.37 404,650 C420.17,656.12 437.67,662.28 454.31,667.93 " fill="none" id="C_0001758213171584933144&lt;-C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M262.21,592.56 C306.98,611.61 357.39,632.37 404,650 C420.17,656.12 437.67,662.28 454.31,667.93 " fill="none" id="C_0014065705372679465152&lt;-C_0014013861000085937293" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="250.05,587.37,253.9996,593.4033,261.0879,592.0779,257.1383,586.0447,250.05,587.37" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="291" y="591.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="64" x="301" y="598.0669">floatstring</text>
-    <path d="M172.75,672.79 C196.68,729.99 231.55,793.02 280,837 C313.12,867.07 335.63,850 374,873 C389.13,882.07 388.68,890.25 404,899 C423.38,910.07 446.13,918.8 466.87,925.37 " fill="none" id="C_0001758213171584933144&lt;-C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M172.75,672.79 C196.68,729.99 231.55,793.02 280,837 C313.12,867.07 335.63,850 374,873 C389.13,882.07 388.68,890.25 404,899 C423.38,910.07 446.13,918.8 466.87,925.37 " fill="none" id="C_0014065705372679465152&lt;-C_0007096971529686780666" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="167.81,660.68,166.3763,667.7472,172.3485,671.7887,173.7821,664.7215,167.81,660.68" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="297" y="826.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="52" x="307" y="833.0669">intstring</text>
-    <path d="M158.7,673.61 C180.97,748.53 218.51,837.62 280,898 C312.04,929.46 339.34,906.46 374,935 C393.13,950.75 384.47,966.74 404,982 C415.81,991.23 429.77,998.49 443.99,1004.18 " fill="none" id="C_0001758213171584933144&lt;-C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M158.7,673.61 C180.97,748.53 218.51,837.62 280,898 C312.04,929.46 339.34,906.46 374,935 C393.13,950.75 384.47,966.74 404,982 C415.81,991.23 429.77,998.49 443.99,1004.18 " fill="none" id="C_0014065705372679465152&lt;-C_0008955619965084495806" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="154.99,660.75,152.8161,667.6256,158.3267,672.2768,160.5006,665.4012,154.99,660.75" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="287" y="887.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="72" x="297" y="894.0669">stringstring</text>
-    <path d="M144.37,673.55 C161.94,767.18 199.54,886.41 280,960 C304.04,981.99 381.65,999.72 443.91,1010.89 " fill="none" id="C_0001758213171584933144&lt;-C_0001119452495635561975-1" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M144.37,673.55 C161.94,767.18 199.54,886.41 280,960 C304.04,981.99 381.65,999.72 443.91,1010.89 " fill="none" id="C_0014065705372679465152&lt;-C_0008955619965084495806-1" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="142.03,660.52,139.1542,667.1328,144.1523,672.3308,147.0281,665.718,142.03,660.52" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="283" y="949.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="80" x="293" y="956.0669">bstringstring</text>
-    <path d="M176.19,395.44 C199.88,345.31 233.65,292.79 280,259 C354.44,204.74 647.38,233.04 656,235 C706.56,246.48 759.59,274.39 793.94,294.9 " fill="none" id="C_0001758213171584933144&lt;-C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M176.19,395.44 C199.88,345.31 233.65,292.79 280,259 C354.44,204.74 647.38,233.04 656,235 C706.56,246.48 759.59,274.39 793.94,294.9 " fill="none" id="C_0014065705372679465152&lt;-C_0016141324540142825631" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="170.68,407.44,176.816,403.652,175.6794,396.531,169.5434,400.319,170.68,407.44" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="505.5" y="215.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="41" x="515.5" y="222.0669">atfloat</text>
-    <path d="M142.26,660.51 C158.96,763.5 196.4,907.18 280,1004 C324.81,1055.9 399.94,1082.14 455.97,1095.08 " fill="none" id="C_0001758213171584933144-&gt;C_0000340562099063642390" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M142.26,660.51 C158.96,763.5 196.4,907.18 280,1004 C324.81,1055.9 399.94,1082.14 455.97,1095.08 " fill="none" id="C_0014065705372679465152-&gt;C_0002724496792509139121" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="460.99,1096.22,453.0921,1090.3359,456.1128,1095.1187,451.33,1098.1394,460.99,1096.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M146.03,660.75 C168.64,808.06 213.61,1037.94 280,1092 C328.39,1131.4 401.2,1131.2 455.61,1123.49 " fill="none" id="C_0001758213171584933144-&gt;C_0000340562099063642390-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M146.03,660.75 C168.64,808.06 213.61,1037.94 280,1092 C328.39,1131.4 401.2,1131.2 455.61,1123.49 " fill="none" id="C_0014065705372679465152-&gt;C_0002724496792509139121-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="460.81,1122.72,451.324,1120.0712,455.8631,1123.4471,452.4873,1127.9862,460.81,1122.72" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="318.5" cy="1084.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="15" x="325.5" y="1088.0669">cb</text>
-    <path d="M224.6,660.83 C241.81,679.32 260.52,697.11 280,712 C316.65,740.01 340.96,723.81 374,756 C395.35,776.81 381.5,796.44 404,816 C415.87,826.32 430.38,834.13 445.26,840.03 " fill="none" id="C_0001758213171584933144-&gt;C_0001388877149159894665" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M224.6,660.83 C241.81,679.32 260.52,697.11 280,712 C316.65,740.01 340.96,723.81 374,756 C395.35,776.81 381.5,796.44 404,816 C415.87,826.32 430.38,834.13 445.26,840.03 " fill="none" id="C_0014065705372679465152-&gt;C_0011111017193279157322" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="450.31,841.96,443.3315,835.0101,445.6396,840.1747,440.475,842.4827,450.31,841.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M183.43,660.76 C207.5,704.15 239.63,749.61 280,781 C286.88,786.35 375.65,813.14 445.26,833.64 " fill="none" id="C_0001758213171584933144-&gt;C_0001388877149159894665-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M183.43,660.76 C207.5,704.15 239.63,749.61 280,781 C286.88,786.35 375.65,813.14 445.26,833.64 " fill="none" id="C_0014065705372679465152-&gt;C_0011111017193279157322-1" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="450.24,835.1,442.7375,828.7194,445.4439,833.6869,440.4764,836.3932,450.24,835.1" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="314.5" cy="773.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="321.5" y="777.0669">gcb</text>
--- a/docs/test_cases/t00014_class_mermaid.svg
+++ b/docs/test_cases/t00014_class_mermaid.svg
@@ -474,8 +474,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L21">
-          <g title="A" id="classId-C_0000765890579167335652-0" class="node default clickable">
+        <a transform="translate(1157.2421875, 834)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L21">
+          <g title="A" id="classId-C_0006127124633338685220-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"/>
            <line y2="39.5" y1="39.5" x2="34.1796875" x1="-34.1796875" class="divider"/>
@@ -503,8 +503,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L26">
-          <g title="B" id="classId-C_0000934136012292043506-1" class="node default clickable">
+        <a transform="translate(600.9765625, 72)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L26">
+          <g title="B" id="classId-C_0007473088098336348050-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"/>
            <line y2="28.5" y1="28.5" x2="72.6484375" x1="-72.6484375" class="divider"/>
@@ -527,8 +527,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30">
-          <g title="A" id="classId-C_0002186387853087008570-2" class="node default clickable">
+        <a transform="translate(936.6640625, 406)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30">
+          <g title="A" id="classId-C_0017491102824696068567-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"/>
            <line y2="17.5" y1="17.5" x2="68.3984375" x1="-68.3984375" class="divider"/>
@@ -546,8 +546,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L31">
-          <g title="A" id="classId-C_0000947292733740993297-3" class="node default clickable">
+        <a transform="translate(936.6640625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L31">
+          <g title="A" id="classId-C_0007578341869927946377-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"/>
            <line y2="17.5" y1="17.5" x2="136.3984375" x1="-136.3984375" class="divider"/>
@@ -565,8 +565,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L34">
-          <g title="A" id="classId-C_0001700006390494465667-4" class="node default clickable">
+        <a transform="translate(936.6640625, 941)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L34">
+          <g title="A" id="classId-C_0013600051123955725337-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"/>
            <line y2="17.5" y1="17.5" x2="46.6171875" x1="-46.6171875" class="divider"/>
@@ -584,8 +584,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L37">
-          <g title="A" id="classId-C_0002017665567517853203-5" class="node default clickable">
+        <a transform="translate(936.6640625, 1262)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L37">
+          <g title="A" id="classId-C_0016141324540142825631-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"/>
            <line y2="17.5" y1="17.5" x2="55.953125" x1="-55.953125" class="divider"/>
@@ -603,8 +603,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L41">
-          <g title="A" id="classId-C_0000906557320263235873-6" class="node default clickable">
+        <a transform="translate(600.9765625, 832)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L41">
+          <g title="A" id="classId-C_0007252458562105886987-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"/>
            <line y2="17.5" y1="17.5" x2="47.5078125" x1="-47.5078125" class="divider"/>
@@ -622,8 +622,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L34">
-          <g title="A" id="classId-C_0000378898020828430636-7" class="node default clickable">
+        <a transform="translate(600.9765625, 939)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L34">
+          <g title="A" id="classId-C_0003031184166627445092-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"/>
            <line y2="17.5" y1="17.5" x2="58.609375" x1="-58.609375" class="divider"/>
@@ -641,8 +641,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L37">
-          <g title="A" id="classId-C_0002082013375525130414-8" class="node default clickable">
+        <a transform="translate(600.9765625, 1153)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L37">
+          <g title="A" id="classId-C_0016656107004201043317-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"/>
            <line y2="17.5" y1="17.5" x2="67.9453125" x1="-67.9453125" class="divider"/>
@@ -660,8 +660,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L41">
-          <g title="A" id="classId-C_0000051978493292659230-9" class="node default clickable">
+        <a transform="translate(600.9765625, 1046)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L41">
+          <g title="A" id="classId-C_0000415827946341273846-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"/>
            <line y2="17.5" y1="17.5" x2="58.6171875" x1="-58.6171875" class="divider"/>
@@ -679,8 +679,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L38">
-          <g title="A" id="classId-C_0000197769253782961588-10" class="node default clickable">
+        <a transform="translate(600.9765625, 1260)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L38">
+          <g title="A" id="classId-C_0001582154030263692708-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"/>
            <line y2="17.5" y1="17.5" x2="67.953125" x1="-67.953125" class="divider"/>
@@ -698,8 +698,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L21">
-          <g title="A" id="classId-C_0000895940711566401184-11" class="node default clickable">
+        <a transform="translate(600.9765625, 190)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L21">
+          <g title="A" id="classId-C_0007167525692531209473-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"/>
            <line y2="17.5" y1="17.5" x2="81.28125" x1="-81.28125" class="divider"/>
@@ -717,8 +717,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L31">
-          <g title="A" id="classId-C_0001751732625010742161-12" class="node default clickable">
+        <a transform="translate(600.9765625, 725)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L31">
+          <g title="A" id="classId-C_0014013861000085937293-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"/>
            <line y2="17.5" y1="17.5" x2="149.2890625" x1="-149.2890625" class="divider"/>
@@ -736,8 +736,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30">
-          <g title="A" id="classId-C_0000887121441210847583-13" class="node default clickable">
+        <a transform="translate(600.9765625, 297)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30">
+          <g title="A" id="classId-C_0007096971529686780666-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"/>
            <line y2="17.5" y1="17.5" x2="74.171875" x1="-74.171875" class="divider"/>
@@ -755,8 +755,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L30">
-          <g title="A" id="classId-C_0001119452495635561975-14" class="node default clickable">
+        <a transform="translate(600.9765625, 404)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L30">
+          <g title="A" id="classId-C_0008955619965084495806-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"/>
            <line y2="17.5" y1="17.5" x2="103.9453125" x1="-103.9453125" class="divider"/>
@@ -774,8 +774,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/#L111">
-          <g title="A" id="classId-C_0000340562099063642390-15" class="node default clickable">
+        <a transform="translate(600.9765625, 511)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/#L111">
+          <g title="A" id="classId-C_0002724496792509139121-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"/>
            <line y2="17.5" y1="17.5" x2="80.8515625" x1="-80.8515625" class="divider"/>
@@ -793,8 +793,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/#L111">
-          <g title="A" id="classId-C_0001388877149159894665-16" class="node default clickable">
+        <a transform="translate(600.9765625, 618)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/#L111">
+          <g title="A" id="classId-C_0011111017193279157322-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"/>
            <line y2="17.5" y1="17.5" x2="94.6328125" x1="-94.6328125" class="divider"/>
@@ -812,8 +812,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00014/t00014.cc#L56">
-          <g title="R" id="classId-C_0001758213171584933144-17" class="node default clickable">
+        <a transform="translate(158.6015625, 564.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00014/t00014.cc#L56">
+          <g title="R" id="classId-C_0014065705372679465152-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"/>
            <line y2="193.5" y1="193.5" x2="150.6015625" x1="-150.6015625" class="divider"/>
--- a/docs/test_cases/t00015.md
+++ b/docs/test_cases/t00015.md
@@ -56,7 +56,7 @@ class B : public ns1::ns2::Anon { };
    {
      "bases": [],
      "display_name": "ns1::A",
-      "id": "1410694888805149453",
+      "id": "11285559110441195627",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -78,7 +78,7 @@ class B : public ns1::ns2::Anon { };
    {
      "bases": [],
      "display_name": "ns1::ns2_v0_9_0::A",
-      "id": "485552648049088863",
+      "id": "3884421184392710906",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -101,13 +101,13 @@ class B : public ns1::ns2::Anon { };
      "bases": [
        {
          "access": "public",
-          "id": "1410694888805149453",
+          "id": "11285559110441195627",
          "is_virtual": false,
          "name": "clanguml::t00015::ns1::A"
        }
      ],
      "display_name": "ns1::Anon",
-      "id": "1060731132374575329",
+      "id": "8485849058996602634",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -130,13 +130,13 @@ class B : public ns1::ns2::Anon { };
      "bases": [
        {
          "access": "public",
-          "id": "1410694888805149453",
+          "id": "11285559110441195627",
          "is_virtual": false,
          "name": "clanguml::t00015::ns1::A"
        }
      ],
      "display_name": "ns3::ns1::ns2::Anon",
-      "id": "1797521288354158629",
+      "id": "14380170306833269036",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -159,13 +159,13 @@ class B : public ns1::ns2::Anon { };
      "bases": [
        {
          "access": "public",
-          "id": "1797521288354158629",
+          "id": "14380170306833269036",
          "is_virtual": false,
          "name": "clanguml::t00015::ns3::ns1::ns2::Anon"
        }
      ],
      "display_name": "ns3::B",
-      "id": "870882387819356092",
+      "id": "6967059102554848740",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -190,20 +190,20 @@ class B : public ns1::ns2::Anon { };
  "relationships": [
    {
      "access": "public",
-      "destination": "1410694888805149453",
-      "source": "1060731132374575329",
+      "destination": "11285559110441195627",
+      "source": "8485849058996602634",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1410694888805149453",
-      "source": "1797521288354158629",
+      "destination": "11285559110441195627",
+      "source": "14380170306833269036",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1797521288354158629",
-      "source": "870882387819356092",
+      "destination": "14380170306833269036",
+      "source": "6967059102554848740",
      "type": "extension"
    }
  ],
--- 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="fggwdpywj19by" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzov5tha4duru" 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>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fggwdpywj19by)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzov5tha4duru)" height="48" id="C_0011285559110441195627" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fggwdpywj19by)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzov5tha4duru)" height="48" id="C_0003884421184392710906" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fggwdpywj19by)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzov5tha4duru)" height="48" id="C_0008485849058996602634" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fggwdpywj19by)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzov5tha4duru)" height="48" id="C_0014380170306833269036" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fggwdpywj19by)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzov5tha4duru)" height="48" id="C_0006967059102554848740" 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>
      <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="249" y1="256" y2="256"/>
      <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="249" y1="264" y2="264"/>
    </a>
-    <path d="M103.93,72.18 C92.9,86.8 80.72,102.93 71.1,115.68 " fill="none" id="C_0001410694888805149453&lt;-C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M103.93,72.18 C92.9,86.8 80.72,102.93 71.1,115.68 " fill="none" id="C_0011285559110441195627&lt;-C_0008485849058996602634" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="98.51,67.75,116.14,56,109.68,76.18,98.51,67.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M163.44,72.18 C174.61,86.8 186.94,102.93 196.68,115.68 " fill="none" id="C_0001410694888805149453&lt;-C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M163.44,72.18 C174.61,86.8 186.94,102.93 196.68,115.68 " fill="none" id="C_0011285559110441195627&lt;-C_0014380170306833269036" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="157.66,76.14,151.08,56,168.78,67.64,157.66,76.14" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M214.5,184.02 C214.5,197.58 214.5,212.04 214.5,223.68 " fill="none" id="C_0001797521288354158629&lt;-C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M214.5,184.02 C214.5,197.58 214.5,212.04 214.5,223.68 " fill="none" id="C_0014380170306833269036&lt;-C_0006967059102554848740" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="207.5,184,214.5,164,221.5,184,207.5,184" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00015_class_mermaid.svg
+++ b/docs/test_cases/t00015_class_mermaid.svg
@@ -84,8 +84,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L6">
-          <g title="A" id="classId-C_0001410694888805149453-0" class="node default clickable">
+        <a transform="translate(146.22265625, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L6">
+          <g title="A" id="classId-C_0011285559110441195627-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"/>
            <line y2="17.5" y1="17.5" x2="32.390625" x1="-32.390625" class="divider"/>
@@ -103,8 +103,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L10">
-          <g title="A" id="classId-C_0000485552648049088863-1" class="node default clickable">
+        <a transform="translate(311.26171875, 36.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L10">
+          <g title="A" id="classId-C_0003884421184392710906-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"/>
            <line y2="17.5" y1="17.5" x2="82.6484375" x1="-82.6484375" class="divider"/>
@@ -122,8 +122,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L14">
-          <g title="Anon" id="classId-C_0001060731132374575329-2" class="node default clickable">
+        <a transform="translate(55.0546875, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L14">
+          <g title="Anon" id="classId-C_0008485849058996602634-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"/>
            <line y2="17.5" y1="17.5" x2="47.0546875" x1="-47.0546875" class="divider"/>
@@ -141,8 +141,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L21">
-          <g title="Anon" id="classId-C_0001797521288354158629-3" class="node default clickable">
+        <a transform="translate(237.390625, 143.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L21">
+          <g title="Anon" id="classId-C_0014380170306833269036-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"/>
            <line y2="17.5" y1="17.5" x2="85.28125" x1="-85.28125" class="divider"/>
@@ -160,8 +160,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00015/t00015.cc#L24">
-          <g title="B" id="classId-C_0000870882387819356092-4" class="node default clickable">
+        <a transform="translate(237.390625, 250.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00015/t00015.cc#L24">
+          <g title="B" id="classId-C_0006967059102554848740-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"/>
            <line y2="17.5" y1="17.5" x2="32.390625" x1="-32.390625" class="divider"/>
--- a/docs/test_cases/t00016.md
+++ b/docs/test_cases/t00016.md
@@ -60,7 +60,7 @@ template <> struct is_numeric<bool> {
    {
      "bases": [],
      "display_name": "is_numeric<typename>",
-      "id": "932856332558460389",
+      "id": "7462850660467683116",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -96,7 +96,7 @@ template <> struct is_numeric<bool> {
    {
      "bases": [],
      "display_name": "is_numeric<float>",
-      "id": "95618295648274199",
+      "id": "764946365186193592",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -132,7 +132,7 @@ template <> struct is_numeric<bool> {
    {
      "bases": [],
      "display_name": "is_numeric<char>",
-      "id": "979129381790761728",
+      "id": "7833035054326093824",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -168,7 +168,7 @@ template <> struct is_numeric<bool> {
    {
      "bases": [],
      "display_name": "is_numeric<unsigned int>",
-      "id": "2090787690027341836",
+      "id": "16726301520218734694",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -204,7 +204,7 @@ template <> struct is_numeric<bool> {
    {
      "bases": [],
      "display_name": "is_numeric<int>",
-      "id": "500603075237446075",
+      "id": "4004824601899568602",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -240,7 +240,7 @@ template <> struct is_numeric<bool> {
    {
      "bases": [],
      "display_name": "is_numeric<bool>",
-      "id": "2111316837513419920",
+      "id": "16890534700107359361",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -279,32 +279,32 @@ template <> struct is_numeric<bool> {
  "relationships": [
    {
      "access": "public",
-      "destination": "932856332558460389",
-      "source": "95618295648274199",
+      "destination": "7462850660467683116",
+      "source": "764946365186193592",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "932856332558460389",
-      "source": "979129381790761728",
+      "destination": "7462850660467683116",
+      "source": "7833035054326093824",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "932856332558460389",
-      "source": "2090787690027341836",
+      "destination": "7462850660467683116",
+      "source": "16726301520218734694",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "932856332558460389",
-      "source": "500603075237446075",
+      "destination": "7462850660467683116",
+      "source": "4004824601899568602",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "932856332558460389",
-      "source": "2111316837513419920",
+      "destination": "7462850660467683116",
+      "source": "16890534700107359361",
      "type": "instantiation"
    }
  ],
--- 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="f111cnfpf7zyhv" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4b0tqmucqfd6" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f111cnfpf7zyhv)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4b0tqmucqfd6)" height="60.8047" id="C_0007462850660467683116" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f111cnfpf7zyhv)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4b0tqmucqfd6)" height="60.8047" id="C_0000764946365186193592" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f111cnfpf7zyhv)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4b0tqmucqfd6)" height="60.8047" id="C_0007833035054326093824" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f111cnfpf7zyhv)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4b0tqmucqfd6)" height="60.8047" id="C_0016726301520218734694" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f111cnfpf7zyhv)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4b0tqmucqfd6)" height="60.8047" id="C_0004004824601899568602" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f111cnfpf7zyhv)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4b0tqmucqfd6)" height="60.8047" id="C_0016890534700107359361" 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>
@@ -81,15 +81,15 @@
      <ellipse cx="715.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="724.5" y="183.2104">value : enum</text>
    </a>
-    <path d="M324.27,72.09 C272.82,88.76 209.46,109.59 153,129 C147.56,130.87 141.93,132.83 136.29,134.82 " fill="none" id="C_0000932856332558460389&lt;-C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M324.27,72.09 C272.82,88.76 209.46,109.59 153,129 C147.56,130.87 141.93,132.83 136.29,134.82 " fill="none" id="C_0007462850660467683116&lt;-C_0000764946365186193592" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="322.18,65.41,343.36,65.91,326.49,78.73,322.18,65.41" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M361.42,79.95 C335.77,96.01 306.8,114.15 283.18,128.95 " fill="none" id="C_0000932856332558460389&lt;-C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M361.42,79.95 C335.77,96.01 306.8,114.15 283.18,128.95 " fill="none" id="C_0007462850660467683116&lt;-C_0007833035054326093824" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="357.88,73.91,378.55,69.22,365.31,85.77,357.88,73.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M426,89.33 C426,102.73 426,116.81 426,128.74 " fill="none" id="C_0000932856332558460389&lt;-C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M426,89.33 C426,102.73 426,116.81 426,128.74 " fill="none" id="C_0007462850660467683116&lt;-C_0016726301520218734694" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="419,89.22,426,69.22,433,89.22,419,89.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M488.9,80.18 C513.65,96.19 541.54,114.23 564.31,128.95 " fill="none" id="C_0000932856332558460389&lt;-C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M488.9,80.18 C513.65,96.19 541.54,114.23 564.31,128.95 " fill="none" id="C_0007462850660467683116&lt;-C_0004004824601899568602" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="484.95,85.96,471.96,69.22,492.55,74.21,484.95,85.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M527.69,73.98 C576.02,90.46 634.55,110.57 687,129 C692.57,130.96 698.34,133 704.13,135.06 " fill="none" id="C_0000932856332558460389&lt;-C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M527.69,73.98 C576.02,90.46 634.55,110.57 687,129 C692.57,130.96 698.34,133 704.13,135.06 " fill="none" id="C_0007462850660467683116&lt;-C_0016890534700107359361" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="525.36,80.58,508.69,67.5,529.88,67.33,525.36,80.58" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00016_class_mermaid.svg
+++ b/docs/test_cases/t00016_class_mermaid.svg
@@ -114,8 +114,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L4">
-          <g title="is_numeric" id="classId-C_0000932856332558460389-0" class="node default clickable">
+        <a transform="translate(518.5625, 176.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L4">
+          <g title="is_numeric" id="classId-C_0007462850660467683116-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"/>
            <line y2="28.5" y1="28.5" x2="96.4375" x1="-96.4375" class="divider"/>
@@ -138,8 +138,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L8">
-          <g title="is_numeric" id="classId-C_0000095618295648274199-1" class="node default clickable">
+        <a transform="translate(83.9765625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L8">
+          <g title="is_numeric" id="classId-C_0000764946365186193592-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"/>
            <line y2="28.5" y1="28.5" x2="75.9765625" x1="-75.9765625" class="divider"/>
@@ -162,8 +162,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L12">
-          <g title="is_numeric" id="classId-C_0000979129381790761728-2" class="node default clickable">
+        <a transform="translate(285.9375, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L12">
+          <g title="is_numeric" id="classId-C_0007833035054326093824-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"/>
            <line y2="28.5" y1="28.5" x2="75.984375" x1="-75.984375" class="divider"/>
@@ -186,8 +186,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L16">
-          <g title="is_numeric" id="classId-C_0002090787690027341836-3" class="node default clickable">
+        <a transform="translate(518.5625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L16">
+          <g title="is_numeric" id="classId-C_0016726301520218734694-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"/>
            <line y2="28.5" y1="28.5" x2="106.640625" x1="-106.640625" class="divider"/>
@@ -210,8 +210,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L20">
-          <g title="is_numeric" id="classId-C_0000500603075237446075-4" class="node default clickable">
+        <a transform="translate(744.0625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L20">
+          <g title="is_numeric" id="classId-C_0004004824601899568602-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"/>
            <line y2="28.5" y1="28.5" x2="68.859375" x1="-68.859375" class="divider"/>
@@ -234,8 +234,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00016/t00016.cc#L24">
-          <g title="is_numeric" id="classId-C_0002111316837513419920-5" class="node default clickable">
+        <a transform="translate(938.890625, 47.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00016/t00016.cc#L24">
+          <g title="is_numeric" id="classId-C_0016890534700107359361-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"/>
            <line y2="28.5" y1="28.5" x2="75.96875" x1="-75.96875" class="divider"/>
--- a/docs/test_cases/t00017.md
+++ b/docs/test_cases/t00017.md
@@ -85,7 +85,7 @@ private:
    {
      "bases": [],
      "display_name": "A",
-      "id": "121332093434690887",
+      "id": "970656747477527100",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -107,7 +107,7 @@ private:
    {
      "bases": [],
      "display_name": "B",
-      "id": "1424864837456200487",
+      "id": "11398918699649603899",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -129,7 +129,7 @@ private:
    {
      "bases": [],
      "display_name": "C",
-      "id": "2151170391844743478",
+      "id": "17209363134757947829",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -151,7 +151,7 @@ private:
    {
      "bases": [],
      "display_name": "D",
-      "id": "1378112127131766972",
+      "id": "11024897017054135776",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -173,7 +173,7 @@ private:
    {
      "bases": [],
      "display_name": "E",
-      "id": "1535300935831802489",
+      "id": "12282407486654419914",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -195,7 +195,7 @@ private:
    {
      "bases": [],
      "display_name": "F",
-      "id": "1803800465279710134",
+      "id": "14430403722237681072",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -217,7 +217,7 @@ private:
    {
      "bases": [],
      "display_name": "G",
-      "id": "1135797791892670246",
+      "id": "9086382335141361974",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -239,7 +239,7 @@ private:
    {
      "bases": [],
      "display_name": "H",
-      "id": "1243547836571712317",
+      "id": "9948382692573698543",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -261,7 +261,7 @@ private:
    {
      "bases": [],
      "display_name": "I",
-      "id": "387733199705628658",
+      "id": "3101865597645029270",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -283,7 +283,7 @@ private:
    {
      "bases": [],
      "display_name": "J",
-      "id": "747991828672433537",
+      "id": "5983934629379468301",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -305,7 +305,7 @@ private:
    {
      "bases": [],
      "display_name": "K",
-      "id": "1783571342994833467",
+      "id": "14268570743958667740",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -327,7 +327,7 @@ private:
    {
      "bases": [],
      "display_name": "R",
-      "id": "287495916564113342",
+      "id": "2299967332512906736",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -581,79 +583,79 @@ private:
  "relationships": [
    {
      "access": "private",
-      "destination": "121332093434690887",
+      "destination": "970656747477527100",
      "label": "a",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1424864837456200487",
+      "destination": "11398918699649603899",
      "label": "b",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "2151170391844743478",
+      "destination": "17209363134757947829",
      "label": "c",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "1378112127131766972",
+      "destination": "11024897017054135776",
      "label": "d",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "1535300935831802489",
+      "destination": "12282407486654419914",
      "label": "e",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "1803800465279710134",
+      "destination": "14430403722237681072",
      "label": "f",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1135797791892670246",
+      "destination": "9086382335141361974",
      "label": "g",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "1243547836571712317",
+      "destination": "9948382692573698543",
      "label": "h",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "387733199705628658",
+      "destination": "3101865597645029270",
      "label": "i",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "747991828672433537",
+      "destination": "5983934629379468301",
      "label": "j",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "1783571342994833467",
+      "destination": "14268570743958667740",
      "label": "k",
-      "source": "287495916564113342",
+      "source": "2299967332512906736",
      "type": "association"
    }
  ],
--- 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="f79eo8rg00dq5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fx0hkp2gcm165" 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,168 +9,168 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0000970656747477527100" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0011398918699649603899" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0017209363134757947829" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0011024897017054135776" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0012282407486654419914" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0014430403722237681072" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0009086382335141361974" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0009948382692573698543" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0003101865597645029270" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0005983934629379468301" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="48" id="C_0014268570743958667740" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f79eo8rg00dq5)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fx0hkp2gcm165)" height="112.0234" id="C_0002299967332512906736" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L28" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L28" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <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_0002299967332512906736&lt;-C_0000970656747477527100" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="239.82,120.06,232.7927,118.4422,228.5966,124.3067,235.6239,125.9245,239.82,120.06" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="164" y="163.0669">-a</text>
-    <path d="M286.66,120.01 C239.94,142.86 185.91,170.26 138,197 C133.93,199.27 129.67,201.79 125.55,204.29 " fill="none" id="C_0000287495916564113342-&gt;C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M286.66,120.01 C239.94,142.86 185.91,170.26 138,197 C133.93,199.27 129.67,201.79 125.55,204.29 " fill="none" id="C_0002299967332512906736-&gt;C_0011398918699649603899" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="121.15,207,130.9093,205.6752,125.4044,204.3731,126.7064,198.8682,121.15,207" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="226" y="163.0669">-b</text>
-    <path d="M322.33,120.08 C279.51,149.32 229.87,183.22 200.8,203.07 " fill="none" id="C_0000287495916564113342-&gt;C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M322.33,120.08 C279.51,149.32 229.87,183.22 200.8,203.07 " fill="none" id="C_0002299967332512906736-&gt;C_0017209363134757947829" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="196.32,206.13,206.0096,204.3659,200.4514,203.3138,201.5036,197.7556,196.32,206.13" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="277" y="163.0669">-c</text>
-    <path d="M349.34,120.08 C324.54,145.54 296.31,174.52 276.66,194.69 " fill="none" id="C_0000287495916564113342-&gt;C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M349.34,120.08 C324.54,145.54 296.31,174.52 276.66,194.69 " fill="none" id="C_0002299967332512906736-&gt;C_0011024897017054135776" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="272.85,198.6,281.9915,194.9348,276.3352,195.0148,276.2552,189.3585,272.85,198.6" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="320" y="163.0669">-d</text>
-    <path d="M376.35,120.08 C364.57,144.41 351.24,171.96 341.57,191.97 " fill="none" id="C_0000287495916564113342-&gt;C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M376.35,120.08 C364.57,144.41 351.24,171.96 341.57,191.97 " fill="none" id="C_0002299967332512906736-&gt;C_0012282407486654419914" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="339.31,196.62,346.8402,190.272,341.4945,192.1225,339.6441,186.7768,339.31,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="363" y="163.0669">-e</text>
-    <path d="M403,133.26 C403,155.95 403,179.72 403,196.62 " fill="none" id="C_0000287495916564113342&lt;-C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M403,133.26 C403,155.95 403,179.72 403,196.62 " fill="none" id="C_0002299967332512906736&lt;-C_0014430403722237681072" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="403,120.08,399,126.08,403,132.08,407,126.08,403,120.08" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="9" x="404" y="163.0669">-f</text>
-    <path d="M429.65,120.08 C441.43,144.41 454.76,171.96 464.43,191.97 " fill="none" id="C_0000287495916564113342-&gt;C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M429.65,120.08 C441.43,144.41 454.76,171.96 464.43,191.97 " fill="none" id="C_0002299967332512906736-&gt;C_0009086382335141361974" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="466.69,196.62,466.3559,186.7768,464.5055,192.1225,459.1598,190.272,466.69,196.62" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="453" y="163.0669">-g</text>
-    <path d="M456.66,120.08 C481.46,145.54 509.69,174.52 529.34,194.69 " fill="none" id="C_0000287495916564113342-&gt;C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M456.66,120.08 C481.46,145.54 509.69,174.52 529.34,194.69 " fill="none" id="C_0002299967332512906736-&gt;C_0009948382692573698543" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="533.15,198.6,529.7448,189.3585,529.6648,195.0148,524.0085,194.9348,533.15,198.6" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="13" x="502" y="163.0669">-h</text>
-    <path d="M482.6,120.08 C526.05,150.15 576.62,185.14 604.91,204.71 " fill="none" id="C_0000287495916564113342-&gt;C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M482.6,120.08 C526.05,150.15 576.62,185.14 604.91,204.71 " fill="none" id="C_0002299967332512906736-&gt;C_0003101865597645029270" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="609.25,207.72,604.1332,199.3046,605.1411,204.871,599.5748,205.8789,609.25,207.72" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="550" y="163.0669">-i</text>
-    <path d="M517.59,120.01 C563.14,142.75 615.64,170.06 662,197 C666.34,199.52 670.88,202.35 675.2,205.15 " fill="none" id="C_0000287495916564113342-&gt;C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M517.59,120.01 C563.14,142.75 615.64,170.06 662,197 C666.34,199.52 670.88,202.35 675.2,205.15 " fill="none" id="C_0002299967332512906736-&gt;C_0005983934629379468301" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="679.43,207.91,674.0946,199.6315,675.2479,205.1695,669.7099,206.3228,679.43,207.91" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="8" x="608" y="163.0669">-j</text>
-    <path d="M559.13,120.02 C614.82,141.62 677.28,168.16 732,197 C736.23,199.23 740.62,201.76 744.84,204.3 " fill="none" id="C_0000287495916564113342-&gt;C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M559.13,120.02 C614.82,141.62 677.28,168.16 732,197 C736.23,199.23 740.62,201.76 744.84,204.3 " fill="none" id="C_0002299967332512906736-&gt;C_0014268570743958667740" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="749.33,207.05,743.7539,198.9317,745.0693,204.4335,739.5675,205.7489,749.33,207.05" style="stroke: #A80036; stroke-width: 1.0;"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="12" x="664" y="163.0669">-k</text>
  </g>
--- a/docs/test_cases/t00017_class_mermaid.svg
+++ b/docs/test_cases/t00017_class_mermaid.svg
@@ -186,8 +186,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L5">
-          <g title="A" id="classId-C_0000121332093434690887-0" class="node default clickable">
+        <a transform="translate(21.28125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L5">
+          <g title="A" id="classId-C_0000970656747477527100-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -205,8 +205,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L7">
-          <g title="B" id="classId-C_0001424864837456200487-1" class="node default clickable">
+        <a transform="translate(97.84375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L7">
+          <g title="B" id="classId-C_0011398918699649603899-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -224,8 +224,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L9">
-          <g title="C" id="classId-C_0002151170391844743478-2" class="node default clickable">
+        <a transform="translate(174.40625, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L9">
+          <g title="C" id="classId-C_0017209363134757947829-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -243,8 +243,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L11">
-          <g title="D" id="classId-C_0001378112127131766972-3" class="node default clickable">
+        <a transform="translate(250.96875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L11">
+          <g title="D" id="classId-C_0011024897017054135776-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -262,8 +262,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L13">
-          <g title="E" id="classId-C_0001535300935831802489-4" class="node default clickable">
+        <a transform="translate(327.0859375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L13">
+          <g title="E" id="classId-C_0012282407486654419914-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"/>
            <line y2="17.5" y1="17.5" x2="12.8359375" x1="-12.8359375" class="divider"/>
@@ -281,8 +281,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L15">
-          <g title="F" id="classId-C_0001803800465279710134-5" class="node default clickable">
+        <a transform="translate(402.3125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L15">
+          <g title="F" id="classId-C_0014430403722237681072-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"/>
            <line y2="17.5" y1="17.5" x2="12.390625" x1="-12.390625" class="divider"/>
@@ -300,8 +300,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L17">
-          <g title="G" id="classId-C_0001135797791892670246-6" class="node default clickable">
+        <a transform="translate(478.4296875, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L17">
+          <g title="G" id="classId-C_0009086382335141361974-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"/>
            <line y2="17.5" y1="17.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -319,8 +319,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L19">
-          <g title="H" id="classId-C_0001243547836571712317-7" class="node default clickable">
+        <a transform="translate(555.4375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L19">
+          <g title="H" id="classId-C_0009948382692573698543-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -338,8 +338,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L21">
-          <g title="I" id="classId-C_0000387733199705628658-8" class="node default clickable">
+        <a transform="translate(628.4453125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L21">
+          <g title="I" id="classId-C_0003101865597645029270-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"/>
            <line y2="17.5" y1="17.5" x2="9.7265625" x1="-9.7265625" class="divider"/>
@@ -357,8 +357,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L23">
-          <g title="J" id="classId-C_0000747991828672433537-9" class="node default clickable">
+        <a transform="translate(700.125, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L23">
+          <g title="J" id="classId-C_0005983934629379468301-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"/>
            <line y2="17.5" y1="17.5" x2="11.953125" x1="-11.953125" class="divider"/>
@@ -376,8 +376,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L25">
-          <g title="K" id="classId-C_0001783571342994833467-10" class="node default clickable">
+        <a transform="translate(775.359375, 271.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L25">
+          <g title="K" id="classId-C_0014268570743958667740-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -395,8 +395,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00017/t00017.cc#L27">
-          <g title="R" id="classId-C_0000287495916564113342-11" class="node default clickable">
+        <a transform="translate(402.3125, 91.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00017/t00017.cc#L27">
+          <g title="R" id="classId-C_0002299967332512906736-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"/>
            <line y2="50.5" y1="50.5" x2="222.984375" x1="-222.984375" class="divider"/>
--- a/docs/test_cases/t00018.md
+++ b/docs/test_cases/t00018.md
@@ -142,7 +142,7 @@ void widget::draw(const clanguml::t00018::widget &w)
    {
      "bases": [],
      "display_name": "impl::widget",
-      "id": "130502639682787993",
+      "id": "1044021117462303949",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -271,7 +277,7 @@ void widget::draw(const clanguml::t00018::widget &w)
    {
      "bases": [],
      "display_name": "widget",
-      "id": "1005661284373854088",
+      "id": "8045290274990832704",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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 &"
        }
      ],
@@ -569,15 +593,15 @@ void widget::draw(const clanguml::t00018::widget &w)
  "relationships": [
    {
      "access": "public",
-      "destination": "1005661284373854088",
-      "source": "130502639682787993",
+      "destination": "8045290274990832704",
+      "source": "1044021117462303949",
      "type": "dependency"
    },
    {
      "access": "private",
-      "destination": "130502639682787993",
+      "destination": "1044021117462303949",
      "label": "pImpl",
-      "source": "1005661284373854088",
+      "source": "8045290274990832704",
      "type": "aggregation"
    }
  ],
--- 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="f1uyu1whinneeh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f5b4bsngbhf7" 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,126 +9,126 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1uyu1whinneeh)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5b4bsngbhf7)" height="107.2188" id="C_0001044021117462303949" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L15" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L15" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L13" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L13" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L14" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L14" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1uyu1whinneeh)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5b4bsngbhf7)" height="192.0469" id="C_0008045290274990832704" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L24" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L24" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L27" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L27" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L29" xlink:show="new" xlink:title="widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L29" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L25" xlink:show="new" xlink:title="~widget" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L25" target="_top" title="~widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L30" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L30" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L31" xlink:show="new" xlink:title="operator=" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L31" target="_top" title="operator=" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L21" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L21" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L22" xlink:show="new" xlink:title="draw" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L22" target="_top" title="draw" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L23" xlink:show="new" xlink:title="shown" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L23" target="_top" title="shown" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <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_0001044021117462303949-&gt;C_0008045290274990832704" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="148.91,191.91,152.6773,182.8102,148.7815,186.9117,144.68,183.0158,148.91,191.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M156,178.29 C156,156.29 156,134.11 156,115.14 " fill="none" id="C_0001005661284373854088&lt;-C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M156,178.29 C156,156.29 156,134.11 156,115.14 " fill="none" id="C_0008045290274990832704&lt;-C_0001044021117462303949" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="156,191.57,160,185.57,156,179.57,152,185.57,156,191.57" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="159" y="151.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="35" x="169" y="158.0669">pImpl</text>
--- a/docs/test_cases/t00018_class_mermaid.svg
+++ b/docs/test_cases/t00018_class_mermaid.svg
@@ -78,8 +78,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018_impl.h#L9">
-          <g title="widget" id="classId-C_0000130502639682787993-0" class="node default clickable">
+        <a transform="translate(150, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018_impl.h#L9">
+          <g title="widget" id="classId-C_0001044021117462303949-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"/>
            <line y2="-4.5" y1="-4.5" x2="142" x1="-142" class="divider"/>
@@ -117,8 +117,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00018/t00018.h#L17">
-          <g title="widget" id="classId-C_0001005661284373854088-1" class="node default clickable">
+        <a transform="translate(150, 359.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00018/t00018.h#L17">
+          <g title="widget" id="classId-C_0008045290274990832704-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"/>
            <line y2="-70.5" y1="-70.5" x2="141.3515625" x1="-141.3515625" class="divider"/>
--- a/docs/test_cases/t00019.md
+++ b/docs/test_cases/t00019.md
@@ -163,7 +163,7 @@ class Base {
    {
      "bases": [],
      "display_name": "Base",
-      "id": "261668487476634123",
+      "id": "2093347899813072991",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -290,7 +298,7 @@ class Base {
    {
      "bases": [],
      "display_name": "Layer1<LowerLayer>",
-      "id": "902631298537519271",
+      "id": "7221050388300154171",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -372,7 +384,7 @@ class Base {
    {
      "bases": [],
      "display_name": "Layer2<LowerLayer>",
-      "id": "1115150925302580647",
+      "id": "8921207402420645183",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -428,7 +442,7 @@ class Base {
    {
      "bases": [],
      "display_name": "Layer3<LowerLayer>",
-      "id": "1853410560073854945",
+      "id": "14827284480590839565",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -588,13 +610,13 @@ class Base {
      "bases": [
        {
          "access": "public",
-          "id": "261668487476634123",
+          "id": "2093347899813072991",
          "is_virtual": false,
          "name": "clanguml::t00019::Base"
        }
      ],
      "display_name": "Layer3<Base>",
-      "id": "972890420743280319",
+      "id": "7783123365946242556",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -615,7 +637,7 @@ class Base {
          "is_variadic": false,
          "kind": "argument",
          "template_parameters": [],
-          "type": "clanguml::t00019::Base"
+          "type": "Base"
        }
      ],
      "type": "class"
@@ -624,13 +646,13 @@ class Base {
      "bases": [
        {
          "access": "public",
-          "id": "972890420743280319",
+          "id": "7783123365946242556",
          "is_virtual": false,
          "name": "clanguml::t00019::Layer3<clanguml::t00019::Base>"
        }
      ],
      "display_name": "Layer2<Layer3<Base>>",
-      "id": "129784999866998870",
+      "id": "1038279998935990962",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -658,7 +680,7 @@ class Base {
              "type": "clanguml::t00019::Base"
            }
          ],
-          "type": "clanguml::t00019::Layer3"
+          "type": "Layer3"
        }
      ],
      "type": "class"
@@ -667,13 +689,13 @@ class Base {
      "bases": [
        {
          "access": "public",
-          "id": "129784999866998870",
+          "id": "1038279998935990962",
          "is_virtual": false,
          "name": "clanguml::t00019::Layer2<clanguml::t00019::Layer3<clanguml::t00019::Base>>"
        }
      ],
      "display_name": "Layer1<Layer2<Layer3<Base>>>",
-      "id": "659076058325663708",
+      "id": "5272608466605309667",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -708,7 +730,7 @@ class Base {
              "type": "clanguml::t00019::Layer3"
            }
          ],
-          "type": "clanguml::t00019::Layer2"
+          "type": "Layer2"
        }
      ],
      "type": "class"
@@ -716,7 +738,7 @@ class Base {
    {
      "bases": [],
      "display_name": "A",
-      "id": "1015164998787089197",
+      "id": "8121319990296713582",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -754,45 +776,45 @@ class Base {
  "relationships": [
    {
      "access": "public",
-      "destination": "1853410560073854945",
-      "source": "972890420743280319",
+      "destination": "14827284480590839565",
+      "source": "7783123365946242556",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "261668487476634123",
-      "source": "972890420743280319",
+      "destination": "2093347899813072991",
+      "source": "7783123365946242556",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1115150925302580647",
-      "source": "129784999866998870",
+      "destination": "8921207402420645183",
+      "source": "1038279998935990962",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "972890420743280319",
-      "source": "129784999866998870",
+      "destination": "7783123365946242556",
+      "source": "1038279998935990962",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "902631298537519271",
-      "source": "659076058325663708",
+      "destination": "7221050388300154171",
+      "source": "5272608466605309667",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "129784999866998870",
-      "source": "659076058325663708",
+      "destination": "1038279998935990962",
+      "source": "5272608466605309667",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "659076058325663708",
+      "destination": "5272608466605309667",
      "label": "layers",
-      "source": "1015164998787089197",
+      "source": "8121319990296713582",
      "type": "aggregation"
    }
  ],
--- 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="f1cjgonmontp5u" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fv4fwxg3ugbcp" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cjgonmontp5u)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv4fwxg3ugbcp)" height="107.2188" id="C_0002093347899813072991" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L10" xlink:show="new" xlink:title="Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L10" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L12" xlink:show="new" xlink:title="~Base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L12" target="_top" title="~Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L16" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L16" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cjgonmontp5u)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv4fwxg3ugbcp)" height="73.6094" id="C_0007221050388300154171" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L13" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer1.h#L13" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer1.h#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cjgonmontp5u)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv4fwxg3ugbcp)" height="60.8047" id="C_0008921207402420645183" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer2.h#L14" target="_top" title="all_calls_count" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cjgonmontp5u)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv4fwxg3ugbcp)" height="124.8281" id="C_0014827284480590839565" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L12" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L12" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L24" target="_top" title="m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L18" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L18" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L26" target="_top" title="m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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(#f1cjgonmontp5u)" 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(#fv4fwxg3ugbcp)" height="48" id="C_0007783123365946242556" 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(#f1cjgonmontp5u)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="329"/>
+    <rect fill="#FEFECE" filter="url(#fv4fwxg3ugbcp)" height="48" id="C_0001038279998935990962" 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(#f1cjgonmontp5u)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="159.5" y="467"/>
+    <rect fill="#FEFECE" filter="url(#fv4fwxg3ugbcp)" height="48" id="C_0005272608466605309667" 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,34 +163,34 @@
    <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cjgonmontp5u)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fv4fwxg3ugbcp)" height="60.8047" id="C_0008121319990296713582" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M344.03,149.59 C357.61,168.19 371.06,186.61 381.14,200.41 " fill="none" id="C_0014827284480590839565&lt;-C_0007783123365946242556" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="338.29,153.6,332.15,133.32,349.6,145.35,338.29,153.6" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M457.91,140.71 C442.44,162.09 426.45,184.19 414.88,200.17 " fill="none" id="C_0000261668487476634123&lt;-C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M457.91,140.71 C442.44,162.09 426.45,184.19 414.88,200.17 " fill="none" id="C_0002093347899813072991&lt;-C_0007783123365946242556" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="452.44,136.33,469.84,124.24,463.78,144.54,452.44,136.33" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M241.89,273.54 C250.13,292.5 259.21,313.39 265.93,328.84 " fill="none" id="C_0001115150925302580647&lt;-C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M241.89,273.54 C250.13,292.5 259.21,313.39 265.93,328.84 " fill="none" id="C_0008921207402420645183&lt;-C_0001038279998935990962" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="235.45,276.29,233.9,255.16,248.29,270.71,235.45,276.29" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M361.59,263.25 C341,284.61 315.91,310.62 298.23,328.95 " fill="none" id="C_0000972890420743280319&lt;-C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M361.59,263.25 C341,284.61 315.91,310.62 298.23,328.95 " fill="none" id="C_0007783123365946242556&lt;-C_0001038279998935990962" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="356.7,258.24,375.62,248.7,366.78,267.96,356.7,258.24" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M149.29,401.63 C180.96,423.72 217.17,448.97 242.74,466.8 " fill="none" id="C_0000902631298537519271&lt;-C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M149.29,401.63 C180.96,423.72 217.17,448.97 242.74,466.8 " fill="none" id="C_0007221050388300154171&lt;-C_0005272608466605309667" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="145.14,407.27,132.74,390.09,153.15,395.79,145.14,407.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M276,397.41 C276,420.44 276,447.83 276,466.82 " fill="none" id="C_0000129784999866998870&lt;-C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M276,397.41 C276,420.44 276,447.83 276,466.82 " fill="none" id="C_0001038279998935990962&lt;-C_0005272608466605309667" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="269,397.07,276,377.07,283,397.07,269,397.07" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M504.15,388.93 C448.87,413.42 376.51,445.47 328.25,466.85 " fill="none" id="C_0001015164998787089197&lt;-C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M504.15,388.93 C448.87,413.42 376.51,445.47 328.25,466.85 " fill="none" id="C_0008121319990296713582&lt;-C_0005272608466605309667" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="516.39,383.51,509.2848,382.2789,505.4156,388.3641,512.5208,389.5952,516.39,383.51" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="436" cy="429.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="38" x="443" y="433.0669">layers</text>
--- a/docs/test_cases/t00019_class_mermaid.svg
+++ b/docs/test_cases/t00019_class_mermaid.svg
@@ -132,8 +132,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_base.h#L8">
-          <g title="Base" id="classId-C_0000261668487476634123-0" class="node default clickable">
+        <a transform="translate(213.40625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_base.h#L8">
+          <g title="Base" id="classId-C_0002093347899813072991-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"/>
            <line y2="-26.5" y1="-26.5" x2="127.3359375" x1="-127.3359375" class="divider"/>
@@ -171,8 +171,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer1.h#L9">
-          <g title="Layer1" id="classId-C_0000902631298537519271-1" class="node default clickable">
+        <a transform="translate(676.84375, 746.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer1.h#L9">
+          <g title="Layer1" id="classId-C_0007221050388300154171-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"/>
            <line y2="-4.5" y1="-4.5" x2="87.546875" x1="-87.546875" class="divider"/>
@@ -200,8 +200,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer2.h#L6">
-          <g title="Layer2" id="classId-C_0001115150925302580647-2" class="node default clickable">
+        <a transform="translate(320.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer2.h#L6">
+          <g title="Layer2" id="classId-C_0008921207402420645183-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"/>
            <line y2="6.5" y1="6.5" x2="108.875" x1="-108.875" class="divider"/>
@@ -224,8 +224,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019_layer3.h#L8">
-          <g title="Layer3" id="classId-C_0001853410560073854945-3" class="node default clickable">
+        <a transform="translate(95.96875, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019_layer3.h#L8">
+          <g title="Layer3" id="classId-C_0014827284480590839565-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"/>
            <line y2="-4.5" y1="-4.5" x2="87.96875" x1="-87.96875" class="divider"/>
@@ -273,8 +273,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/#L269">
-          <g title="Layer3" id="classId-C_0000972890420743280319-4" class="node default clickable">
+        <a transform="translate(213.40625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/#L269">
+          <g title="Layer3" id="classId-C_0007783123365946242556-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"/>
            <line y2="17.5" y1="17.5" x2="61.765625" x1="-61.765625" class="divider"/>
@@ -292,8 +292,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/#L269">
-          <g title="Layer2" id="classId-C_0000129784999866998870-5" class="node default clickable">
+        <a transform="translate(330.84375, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/#L269">
+          <g title="Layer2" id="classId-C_0001038279998935990962-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"/>
            <line y2="17.5" y1="17.5" x2="96.90625" x1="-96.90625" class="divider"/>
@@ -311,8 +311,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/#L269">
-          <g title="Layer1" id="classId-C_0000659076058325663708-6" class="node default clickable">
+        <a transform="translate(676.84375, 606.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/#L269">
+          <g title="Layer1" id="classId-C_0005272608466605309667-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"/>
            <line y2="17.5" y1="17.5" x2="132.046875" x1="-132.046875" class="divider"/>
@@ -330,8 +330,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00019/t00019.cc#L11">
-          <g title="A" id="classId-C_0001015164998787089197-7" class="node default clickable">
+        <a transform="translate(699.8515625, 404.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00019/t00019.cc#L11">
+          <g title="A" id="classId-C_0008121319990296713582-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"/>
            <line y2="28.5" y1="28.5" x2="222.1015625" x1="-222.1015625" class="divider"/>
--- a/docs/test_cases/t00020.md
+++ b/docs/test_cases/t00020.md
@@ -12,11 +12,16 @@ diagrams:
        - clanguml::t00020
    plantuml:
      after:
-        - '@A(ProductA1) <.. @A(Factory1)'
-        - '@A(ProductB1) <.. @A(Factory1)'
-        - '{{ alias("ProductA2") }} <.. {{ alias("Factory2") }}'
-        - '{{ alias("ProductB2") }} <.. {{ alias("Factory2") }}'
-
+        - '@A(Factory1) ..> @A(ProductA1)'
+        - '@A(Factory1) ..> @A(ProductB1)'
+        - '{{ alias("Factory2") }} ..> {{ alias("ProductA2") }}'
+        - '{{ alias("Factory2") }} ..> {{ alias("ProductB2") }}'
+    mermaid:
+      after:
+        - '@A(Factory1) ..> @A(ProductA1)'
+        - '@A(Factory1) ..> @A(ProductB1)'
+        - '{{ alias("Factory2") }} ..> {{ alias("ProductA2") }}'
+        - '{{ alias("Factory2") }} ..> {{ alias("ProductB2") }}'
 ```
 ## Source code
 File `tests/t00020/t00020.cc`
@@ -105,7 +110,7 @@ public:
    {
      "bases": [],
      "display_name": "ProductA",
-      "id": "425267229659464944",
+      "id": "3402137837275719558",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -115,6 +120,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "~ProductA",
          "is_const": false,
          "is_consteval": false,
          "is_constexpr": true,
@@ -137,10 +143,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 +176,7 @@ public:
            "line": 9,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "bool"
        }
      ],
@@ -186,13 +195,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "425267229659464944",
+          "id": "3402137837275719558",
          "is_virtual": false,
          "name": "clanguml::t00020::ProductA"
        }
      ],
      "display_name": "ProductA1",
-      "id": "1756496029797864207",
+      "id": "14051968238382913662",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -202,6 +211,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "sell",
          "is_const": true,
          "is_consteval": false,
          "is_constexpr": false,
@@ -229,6 +239,7 @@ public:
            "line": 14,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "bool"
        }
      ],
@@ -247,13 +258,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "425267229659464944",
+          "id": "3402137837275719558",
          "is_virtual": false,
          "name": "clanguml::t00020::ProductA"
        }
      ],
      "display_name": "ProductA2",
-      "id": "1531708592885216981",
+      "id": "12253668743081735855",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -263,6 +274,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "sell",
          "is_const": true,
          "is_consteval": false,
          "is_constexpr": false,
@@ -290,6 +302,7 @@ public:
            "line": 19,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "bool"
        }
      ],
@@ -307,7 +320,7 @@ public:
    {
      "bases": [],
      "display_name": "ProductB",
-      "id": "2235759006374865842",
+      "id": "17886072050998926742",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -317,6 +330,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "~ProductB",
          "is_const": false,
          "is_consteval": false,
          "is_constexpr": true,
@@ -339,10 +353,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 +386,7 @@ public:
            "line": 25,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "bool"
        }
      ],
@@ -388,13 +405,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "2235759006374865842",
+          "id": "17886072050998926742",
          "is_virtual": false,
          "name": "clanguml::t00020::ProductB"
        }
      ],
      "display_name": "ProductB1",
-      "id": "1465493024233223845",
+      "id": "11723944193865790765",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -404,6 +421,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "buy",
          "is_const": true,
          "is_consteval": false,
          "is_constexpr": false,
@@ -431,6 +449,7 @@ public:
            "line": 30,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "bool"
        }
      ],
@@ -449,13 +468,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "2235759006374865842",
+          "id": "17886072050998926742",
          "is_virtual": false,
          "name": "clanguml::t00020::ProductB"
        }
      ],
      "display_name": "ProductB2",
-      "id": "2154665562370057871",
+      "id": "17237324498960462969",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -465,6 +484,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "buy",
          "is_const": true,
          "is_consteval": false,
          "is_constexpr": false,
@@ -492,6 +512,7 @@ public:
            "line": 35,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "bool"
        }
      ],
@@ -509,7 +530,7 @@ public:
    {
      "bases": [],
      "display_name": "AbstractFactory",
-      "id": "1705546469218961425",
+      "id": "13644371753751691404",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -519,6 +540,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "make_a",
          "is_const": true,
          "is_consteval": false,
          "is_constexpr": false,
@@ -541,10 +563,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 +591,7 @@ public:
            "line": 41,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "std::unique_ptr<ProductB>"
        }
      ],
@@ -585,13 +610,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "1705546469218961425",
+          "id": "13644371753751691404",
          "is_virtual": false,
          "name": "clanguml::t00020::AbstractFactory"
        }
      ],
      "display_name": "Factory1",
-      "id": "692346848484854107",
+      "id": "5538774787878832856",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -601,6 +626,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "make_a",
          "is_const": true,
          "is_consteval": false,
          "is_constexpr": false,
@@ -623,10 +649,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 +677,7 @@ public:
            "line": 51,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "std::unique_ptr<ProductB>"
        }
      ],
@@ -667,13 +696,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "1705546469218961425",
+          "id": "13644371753751691404",
          "is_virtual": false,
          "name": "clanguml::t00020::AbstractFactory"
        }
      ],
      "display_name": "Factory2",
-      "id": "1566325870805013023",
+      "id": "12530606966440104191",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -683,6 +712,7 @@ public:
      "methods": [
        {
          "access": "public",
+          "display_name": "make_a",
          "is_const": true,
          "is_consteval": false,
          "is_constexpr": false,
@@ -705,10 +735,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 +763,7 @@ public:
            "line": 64,
            "translation_unit": "t00020.cc"
          },
+          "template_parameters": [],
          "type": "std::unique_ptr<ProductB>"
        }
      ],
@@ -751,74 +784,74 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "425267229659464944",
-      "source": "1756496029797864207",
+      "destination": "3402137837275719558",
+      "source": "14051968238382913662",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "425267229659464944",
-      "source": "1531708592885216981",
+      "destination": "3402137837275719558",
+      "source": "12253668743081735855",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "2235759006374865842",
-      "source": "1465493024233223845",
+      "destination": "17886072050998926742",
+      "source": "11723944193865790765",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "2235759006374865842",
-      "source": "2154665562370057871",
+      "destination": "17886072050998926742",
+      "source": "17237324498960462969",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "425267229659464944",
-      "source": "1705546469218961425",
+      "destination": "3402137837275719558",
+      "source": "13644371753751691404",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "2235759006374865842",
-      "source": "1705546469218961425",
+      "destination": "17886072050998926742",
+      "source": "13644371753751691404",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "425267229659464944",
-      "source": "692346848484854107",
+      "destination": "3402137837275719558",
+      "source": "5538774787878832856",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "2235759006374865842",
-      "source": "692346848484854107",
+      "destination": "17886072050998926742",
+      "source": "5538774787878832856",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1705546469218961425",
-      "source": "692346848484854107",
+      "destination": "13644371753751691404",
+      "source": "5538774787878832856",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "425267229659464944",
-      "source": "1566325870805013023",
+      "destination": "3402137837275719558",
+      "source": "12530606966440104191",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "2235759006374865842",
-      "source": "1566325870805013023",
+      "destination": "17886072050998926742",
+      "source": "12530606966440104191",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1705546469218961425",
-      "source": "1566325870805013023",
+      "destination": "13644371753751691404",
+      "source": "12530606966440104191",
      "type": "extension"
    }
  ],
--- 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">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="489px" preserveAspectRatio="none" style="width:874px;height:489px;" version="1.1" viewBox="0 0 874 489" width="874px" zoomAndPan="magnify">
  <defs>
-    <filter height="300%" id="f1ws92fsxl0oyx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wzh18aj8vhyr" 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,209 +9,209 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="81.6094" id="C_0003402137837275719558" style="stroke: #A80036; stroke-width: 1.5;" width="244" x="138.5" y="276"/>
+      <ellipse cx="228.25" cy="292" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M228.3594,287.3438 L227.2031,292.4219 L229.5313,292.4219 L228.3594,287.3438 Z M226.875,285.1094 L229.8594,285.1094 L233.2188,297.5 L230.7656,297.5 L230,294.4375 L226.7188,294.4375 L225.9688,297.5 L223.5313,297.5 L226.875,285.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="248.75" y="296.1543">ProductA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="139.5" x2="381.5" y1="308" y2="308"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="144.5" y="314"/>
+      <ellipse cx="149.5" cy="319" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L8" target="_top" title="~ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="158.5" y="322.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="139.5" x2="381.5" y1="328.8047" y2="328.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="144.5" y="334.8047"/>
+      <ellipse cx="149.5" cy="339.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L9" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="158.5" y="343.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="139.5" x2="381.5" y1="349.6094" y2="349.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="60.8047" id="C_0014051968238382913662" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="6" y="418"/>
+      <ellipse cx="54.75" cy="434" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M57.7188,439.6406 Q57.1406,439.9375 56.5,440.0781 Q55.8594,440.2344 55.1563,440.2344 Q52.6563,440.2344 51.3281,438.5938 Q50.0156,436.9375 50.0156,433.8125 Q50.0156,430.6875 51.3281,429.0313 Q52.6563,427.375 55.1563,427.375 Q55.8594,427.375 56.5,427.5313 Q57.1563,427.6875 57.7188,427.9844 L57.7188,430.7031 Q57.0938,430.125 56.5,429.8594 Q55.9063,429.5781 55.2813,429.5781 Q53.9375,429.5781 53.25,430.6563 Q52.5625,431.7188 52.5625,433.8125 Q52.5625,435.9063 53.25,436.9844 Q53.9375,438.0469 55.2813,438.0469 Q55.9063,438.0469 56.5,437.7813 Q57.0938,437.5 57.7188,436.9219 L57.7188,439.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="75.25" y="438.1543">ProductA1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="450" y2="450"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="12" y="456"/>
+      <ellipse cx="17" cy="461" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L14" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="26" y="464.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="470.8047" y2="470.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="60.8047" id="C_0012253668743081735855" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="476" y="418"/>
+      <ellipse cx="524.75" cy="434" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M527.7188,439.6406 Q527.1406,439.9375 526.5,440.0781 Q525.8594,440.2344 525.1563,440.2344 Q522.6563,440.2344 521.3281,438.5938 Q520.0156,436.9375 520.0156,433.8125 Q520.0156,430.6875 521.3281,429.0313 Q522.6563,427.375 525.1563,427.375 Q525.8594,427.375 526.5,427.5313 Q527.1563,427.6875 527.7188,427.9844 L527.7188,430.7031 Q527.0938,430.125 526.5,429.8594 Q525.9063,429.5781 525.2813,429.5781 Q523.9375,429.5781 523.25,430.6563 Q522.5625,431.7188 522.5625,433.8125 Q522.5625,435.9063 523.25,436.9844 Q523.9375,438.0469 525.2813,438.0469 Q525.9063,438.0469 526.5,437.7813 Q527.0938,437.5 527.7188,436.9219 L527.7188,439.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="545.25" y="438.1543">ProductA2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="646" y1="450" y2="450"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="482" y="456"/>
+      <ellipse cx="487" cy="461" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L19" target="_top" title="sell" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="496" y="464.2104">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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="646" y1="470.8047" y2="470.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="81.6094" id="C_0017886072050998926742" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="418" y="276"/>
+      <ellipse cx="508.25" cy="292" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M508.3594,287.3438 L507.2031,292.4219 L509.5313,292.4219 L508.3594,287.3438 Z M506.875,285.1094 L509.8594,285.1094 L513.2188,297.5 L510.7656,297.5 L510,294.4375 L506.7188,294.4375 L505.9688,297.5 L503.5313,297.5 L506.875,285.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="528.75" y="296.1543">ProductB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="662" y1="308" y2="308"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="424" y="314"/>
+      <ellipse cx="429" cy="319" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L24" target="_top" title="~ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="438" y="322.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="419" x2="662" y1="328.8047" y2="328.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="424" y="334.8047"/>
+      <ellipse cx="429" cy="339.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L25" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="438" y="343.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="662" y1="349.6094" y2="349.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="60.8047" id="C_0011723944193865790765" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="251" y="418"/>
+      <ellipse cx="299.75" cy="434" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M302.7188,439.6406 Q302.1406,439.9375 301.5,440.0781 Q300.8594,440.2344 300.1563,440.2344 Q297.6563,440.2344 296.3281,438.5938 Q295.0156,436.9375 295.0156,433.8125 Q295.0156,430.6875 296.3281,429.0313 Q297.6563,427.375 300.1563,427.375 Q300.8594,427.375 301.5,427.5313 Q302.1563,427.6875 302.7188,427.9844 L302.7188,430.7031 Q302.0938,430.125 301.5,429.8594 Q300.9063,429.5781 300.2813,429.5781 Q298.9375,429.5781 298.25,430.6563 Q297.5625,431.7188 297.5625,433.8125 Q297.5625,435.9063 298.25,436.9844 Q298.9375,438.0469 300.2813,438.0469 Q300.9063,438.0469 301.5,437.7813 Q302.0938,437.5 302.7188,436.9219 L302.7188,439.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="320.25" y="438.1543">ProductB1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="252" x2="421" y1="450" y2="450"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="257" y="456"/>
+      <ellipse cx="262" cy="461" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L30" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="271" y="464.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="252" x2="421" y1="470.8047" y2="470.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="60.8047" id="C_0017237324498960462969" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="692" y="418"/>
+      <ellipse cx="740.75" cy="434" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M743.7188,439.6406 Q743.1406,439.9375 742.5,440.0781 Q741.8594,440.2344 741.1563,440.2344 Q738.6563,440.2344 737.3281,438.5938 Q736.0156,436.9375 736.0156,433.8125 Q736.0156,430.6875 737.3281,429.0313 Q738.6563,427.375 741.1563,427.375 Q741.8594,427.375 742.5,427.5313 Q743.1563,427.6875 743.7188,427.9844 L743.7188,430.7031 Q743.0938,430.125 742.5,429.8594 Q741.9063,429.5781 741.2813,429.5781 Q739.9375,429.5781 739.25,430.6563 Q738.5625,431.7188 738.5625,433.8125 Q738.5625,435.9063 739.25,436.9844 Q739.9375,438.0469 741.2813,438.0469 Q741.9063,438.0469 742.5,437.7813 Q743.0938,437.5 743.7188,436.9219 L743.7188,439.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="761.25" y="438.1543">ProductB2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="693" x2="862" y1="450" y2="450"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="698" y="456"/>
+      <ellipse cx="703" cy="461" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L35" target="_top" title="buy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="712" y="464.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="693" x2="862" y1="470.8047" y2="470.8047"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="73.6094" id="C_0013644371753751691404" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="249.5" y="8"/>
+      <ellipse cx="346.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M346.8594,19.3438 L345.7031,24.4219 L348.0313,24.4219 L346.8594,19.3438 Z M345.375,17.1094 L348.3594,17.1094 L351.7188,29.5 L349.2656,29.5 L348.5,26.4375 L345.2188,26.4375 L344.4688,29.5 L342.0313,29.5 L345.375,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="367.25" y="28.1543">AbstractFactory</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="250.5" x2="550.5" y1="40" y2="40"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="255.5" y="46"/>
+      <ellipse cx="260.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L40" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="269.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="255.5" y="58.8047"/>
+      <ellipse cx="260.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L41" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="269.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="250.5" x2="550.5" y1="73.6094" y2="73.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="73.6094" id="C_0005538774787878832856" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="32.5" y="142"/>
+      <ellipse cx="141.25" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M144.2188,163.6406 Q143.6406,163.9375 143,164.0781 Q142.3594,164.2344 141.6563,164.2344 Q139.1563,164.2344 137.8281,162.5938 Q136.5156,160.9375 136.5156,157.8125 Q136.5156,154.6875 137.8281,153.0313 Q139.1563,151.375 141.6563,151.375 Q142.3594,151.375 143,151.5313 Q143.6563,151.6875 144.2188,151.9844 L144.2188,154.7031 Q143.5938,154.125 143,153.8594 Q142.4063,153.5781 141.7813,153.5781 Q140.4375,153.5781 139.75,154.6563 Q139.0625,155.7188 139.0625,157.8125 Q139.0625,159.9063 139.75,160.9844 Q140.4375,162.0469 141.7813,162.0469 Q142.4063,162.0469 143,161.7813 Q143.5938,161.5 144.2188,160.9219 L144.2188,163.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="161.75" y="162.1543">Factory1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="33.5" x2="311.5" y1="174" y2="174"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="38.5" y="180"/>
+      <ellipse cx="43.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L46" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="52.5" y="188.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="38.5" y="192.8047"/>
+      <ellipse cx="43.5" cy="197.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L51" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="52.5" y="201.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ws92fsxl0oyx)" 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"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="33.5" x2="311.5" y1="207.6094" y2="207.6094"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wzh18aj8vhyr)" height="73.6094" id="C_0012530606966440104191" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="489.5" y="142"/>
+      <ellipse cx="598.25" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M601.2188,163.6406 Q600.6406,163.9375 600,164.0781 Q599.3594,164.2344 598.6563,164.2344 Q596.1563,164.2344 594.8281,162.5938 Q593.5156,160.9375 593.5156,157.8125 Q593.5156,154.6875 594.8281,153.0313 Q596.1563,151.375 598.6563,151.375 Q599.3594,151.375 600,151.5313 Q600.6563,151.6875 601.2188,151.9844 L601.2188,154.7031 Q600.5938,154.125 600,153.8594 Q599.4063,153.5781 598.7813,153.5781 Q597.4375,153.5781 596.75,154.6563 Q596.0625,155.7188 596.0625,157.8125 Q596.0625,159.9063 596.75,160.9844 Q597.4375,162.0469 598.7813,162.0469 Q599.4063,162.0469 600,161.7813 Q600.5938,161.5 601.2188,160.9219 L601.2188,163.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="618.75" y="162.1543">Factory2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="490.5" x2="768.5" y1="174" y2="174"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="495.5" y="180"/>
+      <ellipse cx="500.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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L59" target="_top" title="make_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="509.5" y="188.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="495.5" y="192.8047"/>
+      <ellipse cx="500.5" cy="197.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
    </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/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 href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L64" target="_top" title="make_b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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="509.5" y="201.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"/>
-    <path d="M344.48,238.05 C327.61,253.77 309.81,270.35 295.21,283.96 " fill="none" id="C_0000425267229659464944&lt;-C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="339.88,232.78,359.28,224.26,349.42,243.02,339.88,232.78" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M458.18,238.52 C472.11,252.92 486.71,268.72 499.5,284 C534.96,326.36 571.51,379.11 593.1,411.4 " fill="none" id="C_0000425267229659464944&lt;-C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="453.03,243.27,444.02,224.09,463.02,233.46,453.03,243.27" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M209.28,631.78 C235.74,648.42 264.25,666.34 287.38,680.88 " fill="none" id="C_0002235759006374865842&lt;-C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="205.48,637.66,192.27,621.09,212.93,625.81,205.48,637.66" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M128.5,641.55 C128.5,655.26 128.5,669.22 128.5,680.96 " fill="none" id="C_0002235759006374865842&lt;-C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="121.5,641.26,128.5,621.26,135.5,641.26,121.5,641.26" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M300.38,82.09 C318.03,99.35 339.3,120.16 357.85,138.31 " fill="none" id="C_0001705546469218961425-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="361.52,141.91,357.8918,132.7538,357.9489,138.4104,352.2924,138.4675,361.52,141.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M205.31,82.14 C184.51,97.98 162.92,118.38 149.5,142 C74.94,273.3 90.18,328.89 106.5,479 C108.47,497.1 112.38,516.72 116.37,533.75 " fill="none" id="C_0001705546469218961425-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="117.61,538.94,119.3884,529.253,116.4377,534.0794,111.6114,531.1287,117.61,538.94" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M313.81,404.81 C332.99,388.57 353.38,367.91 366.5,345 C386.91,309.38 395.75,263.18 399.58,229.41 " fill="none" id="C_0000692346848484854107-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="400.15,224.1,395.1967,232.6126,399.6072,229.0705,403.1494,233.481,400.15,224.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M227.68,479.09 C210.54,496.35 189.88,517.16 171.86,535.31 " fill="none" id="C_0000692346848484854107-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="168.3,538.91,177.478,535.3373,171.8212,535.3602,171.7983,529.7034,168.3,538.91" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M221.83,98.4 C179.15,158.85 123.85,260.73 160.5,345 C170.79,368.65 190.09,389.11 209.23,404.99 " fill="none" id="C_0001705546469218961425&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="216.27,94.14,233.73,82.13,227.57,102.41,216.27,94.14" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M473.5,801.82 C473.5,752.08 473.5,659.75 473.5,581 C473.5,441 473.5,441 473.5,441 C473.5,364.32 443.77,279.26 422.79,228.78 " fill="none" id="C_0001566325870805013023-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="420.78,224,420.56,233.8464,422.7081,228.6133,427.9413,230.7614,420.78,224" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M333.44,826.93 C216.81,814.45 63.82,789.4 25.5,742 C-4.69,704.65 32.17,658.08 69.93,624.64 " fill="none" id="C_0001566325870805013023-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="74.05,621.04,64.6428,623.9562,70.2871,624.3325,69.9108,629.9768,74.05,621.04" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M434.59,68.78 C575.25,98.26 751.5,164.86 751.5,313.5 C751.5,313.5 751.5,313.5 751.5,581 C751.5,686.99 641.2,761.42 559.56,802 " fill="none" id="C_0001705546469218961425&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="432.81,75.56,414.56,64.78,435.55,61.84,432.81,75.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M263.5,350.38 C263.5,367.31 263.5,387.65 263.5,404.76 " fill="none" id="C_0001756496029797864207&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="263.5,345.24,259.5,354.24,263.5,350.24,267.5,354.24,263.5,345.24" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M325.25,675.67 C311.75,624.79 286.76,530.64 273.08,479.08 " fill="none" id="C_0001465493024233223845&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="326.6,680.75,328.1496,671.0238,325.3135,675.9184,320.4189,673.0823,326.6,680.75" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M600.38,477.43 C574.28,551.62 512.92,725.99 486.25,801.77 " fill="none" id="C_0001531708592885216981&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="602.05,472.69,595.2725,479.836,600.3792,477.4026,602.8126,482.5093,602.05,472.69" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M214.77,743.88 C263.21,761.5 323.86,783.56 374.26,801.9 " fill="none" id="C_0002154665562370057871&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="209.82,742.08,216.9045,748.9218,214.5173,743.7933,219.6458,741.4061,209.82,742.08" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="490.5" x2="768.5" y1="207.6094" y2="207.6094"/>
+    <path d="M191.83,370.62 C170.77,386.76 148.35,403.94 130.05,417.96 " fill="none" id="C_0003402137837275719558&lt;-C_0014051968238382913662" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="187.82,364.87,207.95,358.26,196.34,375.99,187.82,364.87" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M372.21,366.06 C412.61,383.44 457.01,402.54 492.65,417.88 " fill="none" id="C_0003402137837275719558&lt;-C_0012253668743081735855" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="369.28,372.42,353.68,358.09,374.82,359.56,369.28,372.42" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M460.13,369.02 C434.03,385.59 405.95,403.41 383.16,417.88 " fill="none" id="C_0017886072050998926742&lt;-C_0011723944193865790765" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="456.71,362.9,477.35,358.09,464.22,374.72,456.71,362.9" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M631.7,367.83 C662.63,384.73 696.18,403.06 723.29,417.88 " fill="none" id="C_0017886072050998926742&lt;-C_0017237324498960462969" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="628.06,373.82,613.87,358.09,634.77,361.54,628.06,373.82" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M387.9,82.16 C375.09,117.29 353.72,171.65 329.5,216 C319.16,234.94 306.06,254.72 294.06,271.64 " fill="none" id="C_0013644371753751691404-&gt;C_0003402137837275719558" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="291.03,275.88,299.5094,270.8701,293.9308,271.8075,292.9934,266.2288,291.03,275.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M413.42,82.11 C426.52,117.2 448.27,171.53 472.5,216 C482.78,234.86 495.71,254.63 507.52,271.55 " fill="none" id="C_0013644371753751691404-&gt;C_0017886072050998926742" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="510.5,275.79,508.6135,266.1235,507.6317,271.6945,502.0607,270.7127,510.5,275.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M195.85,216.09 C206.84,233.06 220.04,253.47 231.64,271.4 " fill="none" id="C_0005538774787878832856-&gt;C_0003402137837275719558" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="234.56,275.91,233.0345,266.18,231.8461,271.7106,226.3155,270.5222,234.56,275.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M270.15,216.09 C318.42,233.93 376.94,255.55 427.18,274.12 " fill="none" id="C_0005538774787878832856-&gt;C_0017886072050998926742" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="432.01,275.91,424.9506,269.0423,427.319,274.1795,422.1818,276.5479,432.01,275.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M320.66,92.22 C292.48,108.54 261.23,126.63 234.73,141.97 " fill="none" id="C_0013644371753751691404&lt;-C_0005538774787878832856" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="317.38,86.03,338.2,82.07,324.4,98.15,317.38,86.03" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M531.58,216.09 C483.18,233.93 424.5,255.55 374.13,274.12 " fill="none" id="C_0012530606966440104191-&gt;C_0003402137837275719558" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="369.28,275.91,379.1082,276.5479,373.971,274.1795,376.3394,269.0423,369.28,275.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M605.88,216.09 C594.77,233.06 581.42,253.47 569.68,271.4 " fill="none" id="C_0012530606966440104191-&gt;C_0017886072050998926742" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="566.74,275.91,575.0185,270.5746,569.4805,271.7279,568.3272,266.1899,566.74,275.91" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M480.69,92.22 C508.99,108.54 540.38,126.63 567,141.97 " fill="none" id="C_0013644371753751691404&lt;-C_0012530606966440104191" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="476.91,98.12,463.08,82.07,483.9,85.99,476.91,98.12" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M111.59,216.1 C91.1,231.7 70.63,251.94 59.5,276 C38.87,320.59 57.23,377.53 73.46,413.27 " fill="none" id="C_0005538774787878832856-&gt;C_0014051968238382913662" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="75.63,417.95,75.4726,408.1024,73.5265,413.414,68.215,411.4679,75.63,417.95" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M145.36,216.13 C120.4,254.13 91.35,314.37 120.5,358 C148.51,399.93 200.2,422.24 245.99,434.1 " fill="none" id="C_0005538774787878832856-&gt;C_0011723944193865790765" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="250.97,435.35,243.2299,429.2597,246.1235,434.1205,241.2627,437.0141,250.97,435.35" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M654.91,216.21 C677.48,253.23 703.61,311.69 680.5,358 C668.65,381.74 647.17,400.84 625.68,415.19 " fill="none" id="C_0012530606966440104191-&gt;C_0012253668743081735855" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="621.39,418,631.1139,416.4361,625.5786,415.2695,626.7451,409.7343,621.39,418" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M664.89,216.12 C680.34,233.26 697.79,254.63 710.5,276 C736.9,320.38 756.66,377.05 767.65,412.82 " fill="none" id="C_0012530606966440104191-&gt;C_0017237324498960462969" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="769.21,417.94,770.4151,408.1651,767.7536,413.1568,762.762,410.4953,769.21,417.94" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00020_class_mermaid.svg
+++ b/docs/test_cases/t00020_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 1061.28125 592" style="max-width: 1061.28px; background-color: white;" width="1061.28125" 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 1239.65625 592" style="max-width: 1239.66px; background-color: white;" width="1239.65625" 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,18 +50,22 @@
    <g class="root">
      <g class="clusters"/>
      <g class="edgePaths">
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M193.484375,449.0144309438429L180.08723958333334,454.1786924532025C166.69010416666666,459.3429539625619,139.89583333333334,469.67147698128093,126.49869791666667,479.0024051573071C113.1015625,488.3333333333333,113.1015625,496.6666666666667,113.1015625,500.8333333333333L113.1015625,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M362.95651192196533,455L364.68120785163774,459.1666666666667C366.4059037813102,463.3333333333333,369.85529564065513,471.6666666666667,371.57999157032754,480C373.3046875,488.3333333333333,373.3046875,496.6666666666667,373.3046875,500.8333333333333L373.3046875,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M715.671875,448.794968269931L702.1263020833334,453.99580689160916C688.5807291666666,459.19664551328736,661.4895833333334,469.59832275664365,647.9440104166666,478.9658280449885C634.3984375,488.3333333333333,634.3984375,496.6666666666667,634.3984375,500.8333333333333L634.3984375,505"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M885.7772308526012,455L887.5448277938343,459.1666666666667C889.3124247350675,463.3333333333333,892.8476186175336,471.6666666666667,894.6152155587669,480C896.3828125,488.3333333333333,896.3828125,496.6666666666667,896.3828125,500.8333333333333L896.3828125,505"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M320.2578125,110.64550553379145L288.3658854166667,118.2045879448262C256.4739583333333,125.76367035586095,192.69010416666666,140.88183517793047,160.79817708333334,161.0242509222986C128.90625,181.16666666666666,128.90625,206.33333333333334,128.90625,231.5C128.90625,256.6666666666667,128.90625,281.8333333333333,139.66927083333334,298.8798938826467C150.43229166666666,315.92645443196005,171.95833333333334,324.8529088639201,182.72135416666666,329.3161360799001L193.484375,333.77936329588016"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M568.0048320086705,131L573.0287662572255,135.16666666666666C578.0527005057803,139.33333333333334,588.1005690028902,147.66666666666666,593.1245032514452,164.41666666666666C598.1484375,181.16666666666666,598.1484375,206.33333333333334,598.1484375,231.5C598.1484375,256.6666666666667,598.1484375,281.8333333333333,617.7356770833334,300.89484322569723C637.3229166666666,319.95635311806114,676.4973958333334,332.91270623612235,696.0846354166666,339.3908827951529L715.671875,345.8690593541835"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M353.3046875,282L353.3046875,286.1666666666667C353.3046875,290.3333333333333,353.3046875,298.6666666666667,352.54338270712907,307C351.7820779142582,315.3333333333333,350.25946832851633,323.6666666666667,349.4981635356455,327.8333333333333L348.7368587427746,332"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M526.8984375,258.82263843648207L577.9140625,266.8521986970684C628.9296875,274.8817589576547,730.9609375,290.94087947882736,783.2624638728324,303.13710640608036C835.5639902456647,315.3333333333333,838.1357929913296,323.6666666666667,839.4216943641619,327.8333333333333L840.7075957369942,332"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M393.9251716040462,131L387.1550909200385,135.16666666666666C380.38501023603084,139.33333333333334,366.8448488680154,147.66666666666666,360.0747681840077,156C353.3046875,164.33333333333334,353.3046875,172.66666666666666,353.3046875,176.83333333333334L353.3046875,181"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M706.09375,265.4686557191164L670.7200520833334,272.390546432597C635.3463541666666,279.31243714607757,564.5989583333334,293.1562185730388,521.6938749397881,304.2447759531861C478.78879154624275,315.3333333333333,463.72602059248555,323.6666666666667,456.1946351156069,327.8333333333333L448.6632496387283,332"/>
-        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M879.6875,282L879.6875,286.1666666666667C879.6875,290.3333333333333,879.6875,298.6666666666667,878.7241088631985,307C877.7607177263968,315.3333333333333,875.8339354527939,323.6666666666667,874.8705443159923,327.8333333333333L873.9071531791908,332"/>
-        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M667.4453125,108.41773138680219L702.8190104166666,116.34810948900183C738.1927083333334,124.27848759120145,808.9401041666666,140.13924379560072,844.3138020833334,152.23628856446703C879.6875,164.33333333333334,879.6875,172.66666666666666,879.6875,176.83333333333334L879.6875,181"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id1" d="M152.015625,455L152.015625,459.1666666666667C152.015625,463.3333333333333,152.015625,471.6666666666667,158.10715439276487,480C164.1986837855297,488.3333333333333,176.38174257105945,496.6666666666667,182.47327196382432,500.8333333333333L188.56480135658916,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id2" d="M296.03125,446.6460520614605L311.0950520833333,452.20504338455044C326.1588541666667,457.76403470764035,356.2864583333333,468.8820173538202,379.1087592861757,478.6076753435768C401.9310602390181,488.3333333333333,417.44805797803616,496.6666666666667,425.20655684754524,500.8333333333333L432.96505571705427,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id3" d="M726.5703125,455L726.5703125,459.1666666666667C726.5703125,463.3333333333333,726.5703125,471.6666666666667,732.9984657622739,480C739.4266190245477,488.3333333333333,752.2829255490956,496.6666666666667,758.7110788113695,500.8333333333333L765.1392320736434,505"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id4" d="M870.5859375,447.544909164859L885,452.95409097071587C899.4140625,458.3632727765727,928.2421875,469.18163638828634,951.1182776162791,478.7574848608098C973.9943677325582,488.3333333333333,990.9184229651163,496.6666666666667,999.3804505813954,500.8333333333333L1007.8424781976744,505"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id5" d="M308.1328125,113.70187199595244L280.4466145833333,120.75155999662702C252.76041666666666,127.80124799730163,197.38802083333334,141.90062399865081,169.70182291666666,161.53364533265872C142.015625,181.16666666666666,142.015625,206.33333333333334,142.015625,231.5C142.015625,256.6666666666667,142.015625,281.8333333333333,142.49732056840077,298.5833333333333C142.97901613680153,315.3333333333333,143.9424072736031,323.6666666666667,144.42410284200386,327.8333333333333L144.90579841040463,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id6" d="M599.2775469653179,131L607.2417058044316,135.16666666666666C615.2058646435453,139.33333333333334,631.1341823217726,147.66666666666666,639.0983411608863,164.41666666666666C647.0625,181.16666666666666,647.0625,206.33333333333334,647.0625,231.5C647.0625,256.6666666666667,647.0625,281.8333333333333,650.8923560934489,298.5833333333333C654.7222121868979,315.3333333333333,662.3819243737958,323.6666666666667,666.2117804672447,327.8333333333333L670.0416365606936,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id7" d="M284.7304946192053,282L279.29494343267106,286.1666666666667C273.85939224613685,290.3333333333333,262.9882898730684,298.6666666666667,252.73089078190992,307C242.47349169075144,315.3333333333333,232.82979588150292,323.6666666666667,228.00794797687863,327.8333333333333L223.18610007225433,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id8" d="M524.203125,258.9792792792793L574.7630208333334,266.98273273273276C625.3229166666666,274.9861861861862,726.4427083333334,290.99309309309314,772.1378552504817,303.1632132132132C817.8330021676301,315.3333333333333,808.10350433526,323.6666666666667,803.2387554190751,327.8333333333333L798.3740065028902,332"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id9" d="M388.5045158959538,131L382.1886590799615,135.16666666666666C375.87280226396916,139.33333333333334,363.2410886319846,147.66666666666666,356.9252318159923,156C350.609375,164.33333333333334,350.609375,172.66666666666666,350.609375,176.83333333333334L350.609375,181"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id10" d="M884.46875,248.17587797337998L782.41015625,257.97989831114995C680.3515625,267.78391864892,476.234375,287.39195932446,368.39054220857423,301.3626463288967C260.54670941714835,315.3333333333333,248.97623133429673,323.6666666666667,243.1909922928709,327.8333333333333L237.4057532514451,332"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id11" d="M917.2644867549669,282L905.6474889624724,286.1666666666667C894.0304911699781,290.3333333333333,870.796495584989,298.6666666666667,853.351357739508,307C835.906219894027,315.3333333333333,824.2499397880539,323.6666666666667,818.4217997350675,327.8333333333333L812.5936596820809,332"/>
+        <path marker-start="url(#classDiagram-extensionStart)" style="fill:none" class="edge-pattern-solid relation" id="id12" d="M655.3203125,95.55400496129916L722.4440104166666,105.62833746774929C789.5677083333334,115.70266997419942,923.8151041666666,135.8513349870997,990.9388020833334,150.09233416021652C1058.0625,164.33333333333334,1058.0625,172.66666666666666,1058.0625,176.83333333333334L1058.0625,181"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id13" d="M361.1807222682119,282L362.0529456401766,286.1666666666667C362.9251690121412,290.3333333333333,364.66961575607064,298.6666666666667,365.5418391280353,317.25C366.4140625,335.8333333333333,366.4140625,364.6666666666667,366.4140625,393.5C366.4140625,422.3333333333333,366.4140625,451.1666666666667,358.6555636304909,469.75C350.8970647609819,488.3333333333333,335.38006702196384,496.6666666666667,327.62156815245476,500.8333333333333L319.86306928294573,505"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id14" d="M524.203125,253.8481689690543L593.0143229166666,262.7068074742119C661.8255208333334,271.56544597936954,799.4479166666666,289.28272298968477,868.2591145833334,312.55802816150907C937.0703125,335.8333333333333,937.0703125,364.6666666666667,937.0703125,393.5C937.0703125,422.3333333333333,937.0703125,451.1666666666667,929.9002745478036,469.75C922.7302365956072,488.3333333333333,908.3901606912144,496.6666666666667,901.2201227390179,500.8333333333333L894.0500847868217,505"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id15" d="M884.46875,257.1731195959905L828.31640625,265.4775996633254C772.1640625,273.7820797306603,659.859375,290.3910398653302,603.70703125,313.1121865993318C547.5546875,335.8333333333333,547.5546875,364.6666666666667,547.5546875,393.5C547.5546875,422.3333333333333,547.5546875,451.1666666666667,544.9035852713179,469.75C542.2524830426356,488.3333333333333,536.9502785852713,496.6666666666667,534.2991763565891,500.8333333333333L531.648074127907,505"/>
+        <path marker-end="url(#classDiagram-dependencyEnd)" style="fill:none" class="edge-pattern-dashed relation" id="id16" d="M1078.1287251655629,282L1079.7843543046358,286.1666666666667C1081.4399834437086,290.3333333333333,1084.7512417218543,298.6666666666667,1086.4068708609273,317.25C1088.0625,335.8333333333333,1088.0625,364.6666666666667,1088.0625,393.5C1088.0625,422.3333333333333,1088.0625,451.1666666666667,1088.0625,469.75C1088.0625,488.3333333333333,1088.0625,496.6666666666667,1088.0625,500.8333333333333L1088.0625,505"/>
      </g>
      <g class="edgeLabels">
        <g class="edgeLabel">
@@ -184,10 +188,46 @@
            </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 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 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 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(337.5, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L6">
-          <g title="ProductA" id="classId-C_0000425267229659464944-0" class="node default clickable">
+        <a transform="translate(152.015625, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L6">
+          <g title="ProductA" id="classId-C_0003402137837275719558-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"/>
            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
@@ -215,8 +255,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(113.1015625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L12">
-          <g title="ProductA1" id="classId-C_0001756496029797864207-1" class="node default clickable">
+        <a transform="translate(246.3125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L12">
+          <g title="ProductA1" id="classId-C_0014051968238382913662-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"/>
            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
@@ -239,8 +279,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(373.3046875, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L17">
-          <g title="ProductA2" id="classId-C_0001531708592885216981-2" class="node default clickable">
+        <a transform="translate(506.515625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L17">
+          <g title="ProductA2" id="classId-C_0012253668743081735855-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"/>
            <line y2="6.5" y1="6.5" x2="105.1015625" x1="-105.1015625" class="divider"/>
@@ -263,8 +303,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(859.6875, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L22">
-          <g title="ProductB" id="classId-C_0002235759006374865842-3" class="node default clickable">
+        <a transform="translate(726.5703125, 393.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L22">
+          <g title="ProductB" id="classId-C_0017886072050998926742-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"/>
            <line y2="6.5" y1="6.5" x2="144.015625" x1="-144.015625" class="divider"/>
@@ -292,8 +332,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(634.3984375, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L28">
-          <g title="ProductB1" id="classId-C_0001465493024233223845-4" class="node default clickable">
+        <a transform="translate(826.078125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L28">
+          <g title="ProductB1" id="classId-C_0011723944193865790765-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"/>
            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
@@ -316,8 +356,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(896.3828125, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L33">
-          <g title="ProductB2" id="classId-C_0002154665562370057871-5" class="node default clickable">
+        <a transform="translate(1088.0625, 544.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L33">
+          <g title="ProductB2" id="classId-C_0017237324498960462969-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"/>
            <line y2="6.5" y1="6.5" x2="105.9921875" x1="-105.9921875" class="divider"/>
@@ -340,8 +380,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(493.8515625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L38">
-          <g title="AbstractFactory" id="classId-C_0001705546469218961425-6" class="node default clickable">
+        <a transform="translate(481.7265625, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L38">
+          <g title="AbstractFactory" id="classId-C_0013644371753751691404-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"/>
            <line y2="6.5" y1="6.5" x2="173.59375" x1="-173.59375" class="divider"/>
@@ -369,8 +409,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(353.3046875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L44">
-          <g title="Factory1" id="classId-C_0000692346848484854107-7" class="node default clickable">
+        <a transform="translate(350.609375, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L44">
+          <g title="Factory1" id="classId-C_0005538774787878832856-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"/>
            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
@@ -398,8 +438,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(879.6875, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00020/t00020.cc#L57">
-          <g title="Factory2" id="classId-C_0001566325870805013023-8" class="node default clickable">
+        <a transform="translate(1058.0625, 231.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00020/t00020.cc#L57">
+          <g title="Factory2" id="classId-C_0012530606966440104191-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"/>
            <line y2="-4.5" y1="-4.5" x2="173.59375" x1="-173.59375" class="divider"/>
--- a/docs/test_cases/t00021.md
+++ b/docs/test_cases/t00021.md
@@ -79,7 +79,7 @@ public:
    {
      "bases": [],
      "display_name": "Visitor",
-      "id": "1668671110672744395",
+      "id": "13349368885381955166",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -191,13 +197,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "1668671110672744395",
+          "id": "13349368885381955166",
          "is_virtual": false,
          "name": "clanguml::t00021::Visitor"
        }
      ],
      "display_name": "Visitor1",
-      "id": "1028369219400401946",
+      "id": "8226953755203215571",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -283,13 +293,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "1668671110672744395",
+          "id": "13349368885381955166",
          "is_virtual": false,
          "name": "clanguml::t00021::Visitor"
        }
      ],
      "display_name": "Visitor2",
-      "id": "1710373315476287130",
+      "id": "13682986523810297046",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -375,13 +389,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "1668671110672744395",
+          "id": "13349368885381955166",
          "is_virtual": false,
          "name": "clanguml::t00021::Visitor"
        }
      ],
      "display_name": "Visitor3",
-      "id": "1399026228179178025",
+      "id": "11192209825433424201",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -466,7 +484,7 @@ public:
    {
      "bases": [],
      "display_name": "Item",
-      "id": "1491568826758947722",
+      "id": "11932550614071581777",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -547,13 +569,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "1491568826758947722",
+          "id": "11932550614071581777",
          "is_virtual": false,
          "name": "clanguml::t00021::Item"
        }
      ],
      "display_name": "A",
-      "id": "1494142745564026823",
+      "id": "11953141964512214591",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -608,13 +632,13 @@ public:
      "bases": [
        {
          "access": "public",
-          "id": "1491568826758947722",
+          "id": "11932550614071581777",
          "is_virtual": false,
          "name": "clanguml::t00021::Item"
        }
      ],
      "display_name": "B",
-      "id": "1452948650450999568",
+      "id": "11623589203607996547",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -671,98 +697,98 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "1494142745564026823",
-      "source": "1668671110672744395",
+      "destination": "11953141964512214591",
+      "source": "13349368885381955166",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1452948650450999568",
-      "source": "1668671110672744395",
+      "destination": "11623589203607996547",
+      "source": "13349368885381955166",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1494142745564026823",
-      "source": "1028369219400401946",
+      "destination": "11953141964512214591",
+      "source": "8226953755203215571",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1452948650450999568",
-      "source": "1028369219400401946",
+      "destination": "11623589203607996547",
+      "source": "8226953755203215571",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1668671110672744395",
-      "source": "1028369219400401946",
+      "destination": "13349368885381955166",
+      "source": "8226953755203215571",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1494142745564026823",
-      "source": "1710373315476287130",
+      "destination": "11953141964512214591",
+      "source": "13682986523810297046",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1452948650450999568",
-      "source": "1710373315476287130",
+      "destination": "11623589203607996547",
+      "source": "13682986523810297046",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1668671110672744395",
-      "source": "1710373315476287130",
+      "destination": "13349368885381955166",
+      "source": "13682986523810297046",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1494142745564026823",
-      "source": "1399026228179178025",
+      "destination": "11953141964512214591",
+      "source": "11192209825433424201",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1452948650450999568",
-      "source": "1399026228179178025",
+      "destination": "11623589203607996547",
+      "source": "11192209825433424201",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1668671110672744395",
-      "source": "1399026228179178025",
+      "destination": "13349368885381955166",
+      "source": "11192209825433424201",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1668671110672744395",
-      "source": "1491568826758947722",
+      "destination": "13349368885381955166",
+      "source": "11932550614071581777",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1668671110672744395",
-      "source": "1494142745564026823",
+      "destination": "13349368885381955166",
+      "source": "11953141964512214591",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1491568826758947722",
-      "source": "1494142745564026823",
+      "destination": "11932550614071581777",
+      "source": "11953141964512214591",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1668671110672744395",
-      "source": "1452948650450999568",
+      "destination": "13349368885381955166",
+      "source": "11623589203607996547",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1491568826758947722",
-      "source": "1452948650450999568",
+      "destination": "11932550614071581777",
+      "source": "11623589203607996547",
      "type": "extension"
    }
  ],
--- 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="f13nenfe03wi2d" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1o05ebipjy1c3" 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,186 +9,186 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13nenfe03wi2d)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o05ebipjy1c3)" height="94.4141" id="C_0013349368885381955166" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L11" xlink:show="new" xlink:title="~Visitor" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L11" target="_top" title="~Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L12" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L12" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L13" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L13" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13nenfe03wi2d)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o05ebipjy1c3)" height="73.6094" id="C_0008226953755203215571" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L18" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L18" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L19" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L19" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13nenfe03wi2d)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o05ebipjy1c3)" height="73.6094" id="C_0013682986523810297046" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L24" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L24" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L25" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L25" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13nenfe03wi2d)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o05ebipjy1c3)" height="73.6094" id="C_0011192209825433424201" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L30" xlink:show="new" xlink:title="visit_A" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L30" target="_top" title="visit_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L31" xlink:show="new" xlink:title="visit_B" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L31" target="_top" title="visit_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13nenfe03wi2d)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o05ebipjy1c3)" height="81.6094" id="C_0011932550614071581777" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L36" xlink:show="new" xlink:title="~Item" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L36" target="_top" title="~Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L37" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L37" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13nenfe03wi2d)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o05ebipjy1c3)" height="60.8047" id="C_0011953141964512214591" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L42" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L42" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13nenfe03wi2d)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1o05ebipjy1c3)" height="60.8047" id="C_0011623589203607996547" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L47" xlink:show="new" xlink:title="accept" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L47" target="_top" title="accept" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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"/>
-    <path d="M367.78,212.91 C259.99,229.31 116.66,259.4 82.5,304 C53.51,341.84 77.4,397.97 102.9,433.63 " fill="none" id="C_0001668671110672744395-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M367.78,212.91 C259.99,229.31 116.66,259.4 82.5,304 C53.51,341.84 77.4,397.97 102.9,433.63 " fill="none" id="C_0013349368885381955166-&gt;C_0011953141964512214591" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="106.02,437.88,103.9189,428.2579,103.0613,433.8493,97.4699,432.9918,106.02,437.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M130.77,437.88 C114.43,402.56 87.33,343.38 117.5,304 C148.16,263.97 266.75,235.63 362.59,218.39 " fill="none" id="C_0001494142745564026823-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M130.77,437.88 C114.43,402.56 87.33,343.38 117.5,304 C148.16,263.97 266.75,235.63 362.59,218.39 " fill="none" id="C_0011953141964512214591-&gt;C_0013349368885381955166" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="367.72,217.48,358.161,215.1081,362.7964,218.3506,359.5539,222.9859,367.72,217.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M617.1,217.3 C714.14,234.43 837.18,263.12 868.5,304 C897.37,341.69 873.79,397.51 857.14,433.19 " fill="none" id="C_0001668671110672744395-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M617.1,217.3 C714.14,234.43 837.18,263.12 868.5,304 C897.37,341.69 873.79,397.51 857.14,433.19 " fill="none" id="C_0013349368885381955166-&gt;C_0011623589203607996547" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="854.94,437.88,862.3718,431.4172,857.0552,433.3494,855.1229,428.0328,854.94,437.88" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M879.69,437.88 C906.57,402.56 933.67,343.38 903.5,304 C869.79,259.99 729.8,230.11 622.31,213.57 " fill="none" id="C_0001452948650450999568-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M879.69,437.88 C906.57,402.56 933.67,343.38 903.5,304 C869.79,259.99 729.8,230.11 622.31,213.57 " fill="none" id="C_0011623589203607996547-&gt;C_0013349368885381955166" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="617.22,212.8,625.5106,218.1166,622.1624,213.5571,626.7219,210.2088,617.22,212.8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M203.89,378.3 C191.17,395.65 176.03,416.31 163.52,433.37 " fill="none" id="C_0001028369219400401946-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M203.89,378.3 C191.17,395.65 176.03,416.31 163.52,433.37 " fill="none" id="C_0008226953755203215571-&gt;C_0011953141964512214591" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="160.4,437.62,168.9501,432.7318,163.3587,433.5893,162.5011,427.9979,160.4,437.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M344.31,373.91 C350.11,375.34 355.87,376.71 361.5,378 C477.83,404.67 611.25,428.83 708.68,445.3 " fill="none" id="C_0001028369219400401946-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M344.31,373.91 C350.11,375.34 355.87,376.71 361.5,378 C477.83,404.67 611.25,428.83 708.68,445.3 " fill="none" id="C_0008226953755203215571-&gt;C_0011623589203607996547" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="713.87,446.18,705.6577,440.7433,708.9392,445.3511,704.3314,448.6325,713.87,446.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M389.49,253.83 C358.5,270.63 325.3,288.62 297.31,303.79 " fill="none" id="C_0001668671110672744395&lt;-C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M389.49,253.83 C358.5,270.63 325.3,288.62 297.31,303.79 " fill="none" id="C_0013349368885381955166&lt;-C_0008226953755203215571" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="386.52,247.48,407.44,244.1,393.19,259.79,386.52,247.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M390.58,378.13 C338.74,396.51 276.35,418.63 226.61,436.26 " fill="none" id="C_0001710373315476287130-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M390.58,378.13 C338.74,396.51 276.35,418.63 226.61,436.26 " fill="none" id="C_0013682986523810297046-&gt;C_0011953141964512214591" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="221.83,437.96,231.65,438.7132,226.541,436.2847,228.9695,431.1756,221.83,437.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M594.42,378.13 C646.26,396.51 708.65,418.63 758.39,436.26 " fill="none" id="C_0001710373315476287130-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M594.42,378.13 C646.26,396.51 708.65,418.63 758.39,436.26 " fill="none" id="C_0013682986523810297046-&gt;C_0011623589203607996547" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="763.17,437.96,756.0305,431.1756,758.459,436.2847,753.35,438.7132,763.17,437.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M492.5,264.22 C492.5,277.76 492.5,291.54 492.5,303.56 " fill="none" id="C_0001668671110672744395&lt;-C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M492.5,264.22 C492.5,277.76 492.5,291.54 492.5,303.56 " fill="none" id="C_0013349368885381955166&lt;-C_0013682986523810297046" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="485.5,264.1,492.5,244.1,499.5,264.1,485.5,264.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M640.69,373.91 C634.89,375.34 629.13,376.71 623.5,378 C507.17,404.67 373.75,428.83 276.32,445.3 " fill="none" id="C_0001399026228179178025-&gt;C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M640.69,373.91 C634.89,375.34 629.13,376.71 623.5,378 C507.17,404.67 373.75,428.83 276.32,445.3 " fill="none" id="C_0011192209825433424201-&gt;C_0011953141964512214591" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="271.13,446.18,280.6686,448.6325,276.0608,445.3511,279.3423,440.7433,271.13,446.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M781.11,378.3 C793.83,395.65 808.97,416.31 821.48,433.37 " fill="none" id="C_0001399026228179178025-&gt;C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M781.11,378.3 C793.83,395.65 808.97,416.31 821.48,433.37 " fill="none" id="C_0011192209825433424201-&gt;C_0011623589203607996547" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="824.6,437.62,822.4989,427.9979,821.6413,433.5893,816.0499,432.7318,824.6,437.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M595.51,253.83 C626.5,270.63 659.7,288.62 687.69,303.79 " fill="none" id="C_0001668671110672744395&lt;-C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M595.51,253.83 C626.5,270.63 659.7,288.62 687.69,303.79 " fill="none" id="C_0013349368885381955166&lt;-C_0011192209825433424201" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="591.81,259.79,577.56,244.1,598.48,247.48,591.81,259.79" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M492.5,90.28 C492.5,107.03 492.5,126.68 492.5,144.47 " fill="none" id="C_0001491568826758947722-&gt;C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M492.5,90.28 C492.5,107.03 492.5,126.68 492.5,144.47 " fill="none" id="C_0011932550614071581777-&gt;C_0013349368885381955166" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="492.5,149.92,496.5,140.92,492.5,144.92,488.5,140.92,492.5,149.92" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M345.55,97.58 C250.88,136.76 135.26,202.59 78.5,304 C53.84,348.06 86.89,404.22 112.84,437.93 " fill="none" id="C_0001491568826758947722&lt;-C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M345.55,97.58 C250.88,136.76 135.26,202.59 78.5,304 C53.84,348.06 86.89,404.22 112.84,437.93 " fill="none" id="C_0011932550614071581777&lt;-C_0011953141964512214591" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="343.01,91.06,364.18,90.1,348.23,104.05,343.01,91.06" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M654.92,97.14 C754.72,135.45 874.58,200.46 934.5,304 C950.97,332.47 946.96,347.56 934.5,378 C924.84,401.6 905.63,422.32 887.62,437.86 " fill="none" id="C_0001491568826758947722&lt;-C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M654.92,97.14 C754.72,135.45 874.58,200.46 934.5,304 C950.97,332.47 946.96,347.56 934.5,378 C924.84,401.6 905.63,422.32 887.62,437.86 " fill="none" id="C_0011932550614071581777&lt;-C_0011623589203607996547" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="652.2,103.6,635.89,90.07,657.08,90.48,652.2,103.6" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00021_class_mermaid.svg
+++ b/docs/test_cases/t00021_class_mermaid.svg
@@ -236,8 +236,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L9">
-          <g title="Visitor" id="classId-C_0001668671110672744395-0" class="node default clickable">
+        <a transform="translate(672.09375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L9">
+          <g title="Visitor" id="classId-C_0013349368885381955166-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"/>
            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -270,8 +270,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L16">
-          <g title="Visitor1" id="classId-C_0001028369219400401946-1" class="node default clickable">
+        <a transform="translate(147.7734375, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L16">
+          <g title="Visitor1" id="classId-C_0008226953755203215571-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"/>
            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -299,8 +299,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L22">
-          <g title="Visitor2" id="classId-C_0001710373315476287130-2" class="node default clickable">
+        <a transform="translate(497.3203125, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L22">
+          <g title="Visitor2" id="classId-C_0013682986523810297046-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"/>
            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -328,8 +328,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L28">
-          <g title="Visitor3" id="classId-C_0001399026228179178025-3" class="node default clickable">
+        <a transform="translate(846.8671875, 426.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L28">
+          <g title="Visitor3" id="classId-C_0011192209825433424201-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"/>
            <line y2="-4.5" y1="-4.5" x2="139.7734375" x1="-139.7734375" class="divider"/>
@@ -357,8 +357,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L34">
-          <g title="Item" id="classId-C_0001491568826758947722-4" class="node default clickable">
+        <a transform="translate(672.09375, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L34">
+          <g title="Item" id="classId-C_0011932550614071581777-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"/>
            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
@@ -386,8 +386,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L40">
-          <g title="A" id="classId-C_0001494142745564026823-5" class="node default clickable">
+        <a transform="translate(187.7734375, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L40">
+          <g title="A" id="classId-C_0011953141964512214591-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"/>
            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
@@ -410,8 +410,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00021/t00021.cc#L45">
-          <g title="B" id="classId-C_0001452948650450999568-6" class="node default clickable">
+        <a transform="translate(1041.640625, 566.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00021/t00021.cc#L45">
+          <g title="B" id="classId-C_0011623589203607996547-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"/>
            <line y2="6.5" y1="6.5" x2="162.3046875" x1="-162.3046875" class="divider"/>
--- a/docs/test_cases/t00022.md
+++ b/docs/test_cases/t00022.md
@@ -60,7 +60,7 @@ protected:
    {
      "bases": [],
      "display_name": "A",
-      "id": "2012435893382068755",
+      "id": "16099487147056550046",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -162,13 +168,13 @@ protected:
      "bases": [
        {
          "access": "public",
-          "id": "2012435893382068755",
+          "id": "16099487147056550046",
          "is_virtual": false,
          "name": "clanguml::t00022::A"
        }
      ],
      "display_name": "A1",
-      "id": "2282061426381077447",
+      "id": "18256491411048619579",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -244,13 +254,13 @@ protected:
      "bases": [
        {
          "access": "public",
-          "id": "2012435893382068755",
+          "id": "16099487147056550046",
          "is_virtual": false,
          "name": "clanguml::t00022::A"
        }
      ],
      "display_name": "A2",
-      "id": "158819862916671538",
+      "id": "1270558903333372307",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -328,14 +342,14 @@ protected:
  "relationships": [
    {
      "access": "public",
-      "destination": "2012435893382068755",
-      "source": "2282061426381077447",
+      "destination": "16099487147056550046",
+      "source": "18256491411048619579",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "2012435893382068755",
-      "source": "158819862916671538",
+      "destination": "16099487147056550046",
+      "source": "1270558903333372307",
      "type": "extension"
    }
  ],
--- 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="f1298wlm6bzqll" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fb80n93lxa4l3" 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>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1298wlm6bzqll)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb80n93lxa4l3)" height="86.4141" id="C_0016099487147056550046" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L15" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L15" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L16" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L16" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L8" xlink:show="new" xlink:title="template_method" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L8" target="_top" title="template_method" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1298wlm6bzqll)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb80n93lxa4l3)" height="73.6094" id="C_0018256491411048619579" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L21" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L21" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L22" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L22" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1298wlm6bzqll)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fb80n93lxa4l3)" height="73.6094" id="C_0001270558903333372307" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L27" xlink:show="new" xlink:title="method1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L27" target="_top" title="method1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L28" xlink:show="new" xlink:title="method2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L28" target="_top" title="method2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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"/>
-    <path d="M109.15,111.76 C101.19,126.04 92.92,140.85 85.76,153.7 " fill="none" id="C_0002012435893382068755&lt;-C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M109.15,111.76 C101.19,126.04 92.92,140.85 85.76,153.7 " fill="none" id="C_0016099487147056550046&lt;-C_0018256491411048619579" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="103.12,108.21,118.98,94.15,115.35,115.03,103.12,108.21" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M175.85,111.76 C183.81,126.04 192.08,140.85 199.24,153.7 " fill="none" id="C_0002012435893382068755&lt;-C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M175.85,111.76 C183.81,126.04 192.08,140.85 199.24,153.7 " fill="none" id="C_0016099487147056550046&lt;-C_0001270558903333372307" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="169.65,115.03,166.02,94.15,181.88,108.21,169.65,115.03" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00022_class_mermaid.svg
+++ b/docs/test_cases/t00022_class_mermaid.svg
@@ -74,8 +74,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L6">
-          <g title="A" id="classId-C_0002012435893382068755-0" class="node default clickable">
+        <a transform="translate(172.515625, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L6">
+          <g title="A" id="classId-C_0016099487147056550046-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"/>
            <line y2="-4.5" y1="-4.5" x2="100.6640625" x1="-100.6640625" class="divider"/>
@@ -108,8 +108,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L19">
-          <g title="A1" id="classId-C_0002282061426381077447-1" class="node default clickable">
+        <a transform="translate(77.7578125, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L19">
+          <g title="A1" id="classId-C_0018256491411048619579-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"/>
            <line y2="-4.5" y1="-4.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
@@ -137,8 +137,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00022/t00022.cc#L25">
-          <g title="A2" id="classId-C_0000158819862916671538-2" class="node default clickable">
+        <a transform="translate(267.2734375, 253.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00022/t00022.cc#L25">
+          <g title="A2" id="classId-C_0001270558903333372307-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"/>
            <line y2="-4.5" y1="-4.5" x2="69.7578125" x1="-69.7578125" class="divider"/>
--- a/docs/test_cases/t00023.md
+++ b/docs/test_cases/t00023.md
@@ -69,7 +69,7 @@ private:
    {
      "bases": [],
      "display_name": "Strategy",
-      "id": "1469857696438841976",
+      "id": "11758861571510735814",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -145,13 +149,13 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "1469857696438841976",
+          "id": "11758861571510735814",
          "is_virtual": false,
          "name": "clanguml::t00023::Strategy"
        }
      ],
      "display_name": "StrategyA",
-      "id": "1245533075819635385",
+      "id": "9964264606557083084",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -201,13 +207,13 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "1469857696438841976",
+          "id": "11758861571510735814",
          "is_virtual": false,
          "name": "clanguml::t00023::Strategy"
        }
      ],
      "display_name": "StrategyB",
-      "id": "264986406899645",
+      "id": "2119891255197167",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -257,13 +265,13 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "1469857696438841976",
+          "id": "11758861571510735814",
          "is_virtual": false,
          "name": "clanguml::t00023::Strategy"
        }
      ],
      "display_name": "StrategyC",
-      "id": "174795176193483089",
+      "id": "1398361409547864717",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -312,7 +322,7 @@ private:
    {
      "bases": [],
      "display_name": "Context",
-      "id": "2038594012979479050",
+      "id": "16308752103835832406",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -408,27 +422,27 @@ private:
  "relationships": [
    {
      "access": "public",
-      "destination": "1469857696438841976",
-      "source": "1245533075819635385",
+      "destination": "11758861571510735814",
+      "source": "9964264606557083084",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1469857696438841976",
-      "source": "264986406899645",
+      "destination": "11758861571510735814",
+      "source": "2119891255197167",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1469857696438841976",
-      "source": "174795176193483089",
+      "destination": "11758861571510735814",
+      "source": "1398361409547864717",
      "type": "extension"
    },
    {
      "access": "private",
-      "destination": "1469857696438841976",
+      "destination": "11758861571510735814",
      "label": "m_strategy",
-      "source": "2038594012979479050",
+      "source": "16308752103835832406",
      "type": "aggregation"
    }
  ],
--- 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="fzn2brnxdajtw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1c6bc55uxj7aq" 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,111 +9,111 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzn2brnxdajtw)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6bc55uxj7aq)" height="81.6094" id="C_0011758861571510735814" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L8" xlink:show="new" xlink:title="~Strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L8" target="_top" title="~Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L9" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L9" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzn2brnxdajtw)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6bc55uxj7aq)" height="60.8047" id="C_0009964264606557083084" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L14" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L14" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzn2brnxdajtw)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6bc55uxj7aq)" height="60.8047" id="C_0000002119891255197167" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L19" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L19" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzn2brnxdajtw)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6bc55uxj7aq)" height="60.8047" id="C_0001398361409547864717" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L24" xlink:show="new" xlink:title="algorithm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L24" target="_top" title="algorithm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzn2brnxdajtw)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6bc55uxj7aq)" height="94.4141" id="C_0016308752103835832406" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L29" xlink:show="new" xlink:title="Context" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L29" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L34" xlink:show="new" xlink:title="apply" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L34" target="_top" title="apply" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M161.3,274.03 C141.49,290.39 120.4,307.81 103.24,321.98 " fill="none" id="C_0011758861571510735814&lt;-C_0009964264606557083084" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="156.93,268.56,176.81,261.22,165.84,279.35,156.93,268.56" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M225.5,281.37 C225.5,295.49 225.5,309.91 225.5,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225.5,281.37 C225.5,295.49 225.5,309.91 225.5,321.98 " fill="none" id="C_0011758861571510735814&lt;-C_0000002119891255197167" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="218.5,281.22,225.5,261.22,232.5,281.22,218.5,281.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M289.7,274.03 C309.51,290.39 330.6,307.81 347.76,321.98 " fill="none" id="C_0001469857696438841976&lt;-C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M289.7,274.03 C309.51,290.39 330.6,307.81 347.76,321.98 " fill="none" id="C_0011758861571510735814&lt;-C_0001398361409547864717" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="285.16,279.35,274.19,261.22,294.07,268.56,285.16,279.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M225.5,115.44 C225.5,136.58 225.5,159.86 225.5,178.98 " fill="none" id="C_0002038594012979479050&lt;-C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225.5,115.44 C225.5,136.58 225.5,159.86 225.5,178.98 " fill="none" id="C_0016308752103835832406&lt;-C_0011758861571510735814" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="225.5,102.27,221.5,108.27,225.5,114.27,229.5,108.27,225.5,102.27" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="228.5" y="138.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="238.5" y="145.0669">m_strategy</text>
--- a/docs/test_cases/t00023_class_mermaid.svg
+++ b/docs/test_cases/t00023_class_mermaid.svg
@@ -96,8 +96,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L6">
-          <g title="Strategy" id="classId-C_0001469857696438841976-0" class="node default clickable">
+        <a transform="translate(273.25, 260.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L6">
+          <g title="Strategy" id="classId-C_0011758861571510735814-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"/>
            <line y2="6.5" y1="6.5" x2="140.90625" x1="-140.90625" class="divider"/>
@@ -125,8 +125,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L12">
-          <g title="StrategyA" id="classId-C_0001245533075819635385-1" class="node default clickable">
+        <a transform="translate(79.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L12">
+          <g title="StrategyA" id="classId-C_0009964264606557083084-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"/>
            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -149,8 +149,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L17">
-          <g title="StrategyB" id="classId-C_0000000264986406899645-2" class="node default clickable">
+        <a transform="translate(273.25, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L17">
+          <g title="StrategyB" id="classId-C_0000002119891255197167-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"/>
            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -173,8 +173,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L22">
-          <g title="StrategyC" id="classId-C_0000174795176193483089-3" class="node default clickable">
+        <a transform="translate(466.75, 411.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L22">
+          <g title="StrategyC" id="classId-C_0001398361409547864717-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"/>
            <line y2="6.5" y1="6.5" x2="71.75" x1="-71.75" class="divider"/>
@@ -197,8 +197,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00023/t00023.cc#L27">
-          <g title="Context" id="classId-C_0002038594012979479050-4" class="node default clickable">
+        <a transform="translate(273.25, 69.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00023/t00023.cc#L27">
+          <g title="Context" id="classId-C_0016308752103835832406-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"/>
            <line y2="6.5" y1="6.5" x2="150.0234375" x1="-150.0234375" class="divider"/>
--- a/docs/test_cases/t00024.md
+++ b/docs/test_cases/t00024.md
@@ -68,7 +68,7 @@ private:
    {
      "bases": [],
      "display_name": "Target",
-      "id": "1116408959993110019",
+      "id": "8931271679944880159",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -170,13 +176,13 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "1116408959993110019",
+          "id": "8931271679944880159",
          "is_virtual": false,
          "name": "clanguml::t00024::Target"
        }
      ],
      "display_name": "Target1",
-      "id": "669517069151826610",
+      "id": "5356136553214612884",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -252,13 +262,13 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "1116408959993110019",
+          "id": "8931271679944880159",
          "is_virtual": false,
          "name": "clanguml::t00024::Target"
        }
      ],
      "display_name": "Target2",
-      "id": "1210513233906695933",
+      "id": "9684105871253567467",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -334,13 +348,13 @@ private:
      "bases": [
        {
          "access": "public",
-          "id": "1116408959993110019",
+          "id": "8931271679944880159",
          "is_virtual": false,
          "name": "clanguml::t00024::Target"
        }
      ],
      "display_name": "Proxy",
-      "id": "594707401639991215",
+      "id": "4757659213119929724",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -462,27 +482,34 @@ private:
  "relationships": [
    {
      "access": "public",
-      "destination": "1116408959993110019",
-      "source": "669517069151826610",
+      "destination": "8931271679944880159",
+      "source": "5356136553214612884",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1116408959993110019",
-      "source": "1210513233906695933",
+      "destination": "8931271679944880159",
+      "source": "9684105871253567467",
      "type": "extension"
    },
    {
      "access": "private",
-      "destination": "1116408959993110019",
+      "destination": "8931271679944880159",
      "label": "m_target",
-      "source": "594707401639991215",
+      "source": "4757659213119929724",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "8931271679944880159",
+      "label": "m_target",
+      "source": "4757659213119929724",
      "type": "association"
    },
    {
      "access": "public",
-      "destination": "1116408959993110019",
-      "source": "594707401639991215",
+      "destination": "8931271679944880159",
+      "source": "4757659213119929724",
      "type": "extension"
    }
  ],
--- 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="f54avnyvq6h3t" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fiybxcvnfg1s" 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,126 +9,126 @@
    <style type="text/css">a:hover { text-decoration: underline; }</style>
  </defs>
  <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f54avnyvq6h3t)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fiybxcvnfg1s)" height="94.4141" id="C_0008931271679944880159" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L8" xlink:show="new" xlink:title="~Target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L8" target="_top" title="~Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L11" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L11" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f54avnyvq6h3t)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fiybxcvnfg1s)" height="73.6094" id="C_0005356136553214612884" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L16" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L16" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f54avnyvq6h3t)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fiybxcvnfg1s)" height="73.6094" id="C_0009684105871253567467" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L22" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L22" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L23" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L23" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f54avnyvq6h3t)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fiybxcvnfg1s)" height="107.2188" id="C_0004757659213119929724" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L28" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L28" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L32" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L32" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L33" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L33" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M151.91,117.02 C128.52,143.17 102,172.81 81.81,195.39 " fill="none" id="C_0008931271679944880159&lt;-C_0005356136553214612884" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="146.7,112.35,165.25,102.11,157.13,121.68,146.7,112.35" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M193.37,121.82 C188.4,146.74 182.93,174.19 178.7,195.39 " fill="none" id="C_0001116408959993110019&lt;-C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M193.37,121.82 C188.4,146.74 182.93,174.19 178.7,195.39 " fill="none" id="C_0008931271679944880159&lt;-C_0009684105871253567467" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="186.53,120.36,197.3,102.11,200.26,123.09,186.53,120.36" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M335.33,178.87 C311.02,155.69 282.6,128.58 258.65,105.74 " fill="none" id="C_0000594707401639991215-&gt;C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M335.33,178.87 C311.02,155.69 282.6,128.58 258.65,105.74 " fill="none" id="C_0004757659213119929724-&gt;C_0008931271679944880159" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="254.84,102.11,258.5789,111.2216,258.4532,105.5661,264.1087,105.4404,254.84,102.11" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="301.5" y="138.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="59" x="311.5" y="145.0669">m_target</text>
-    <path d="M250.78,118.21 C259.47,128.93 268.89,139.62 278.5,149 C289.13,159.38 301.11,169.53 313.19,178.96 " fill="none" id="C_0001116408959993110019&lt;-C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M250.78,118.21 C259.47,128.93 268.89,139.62 278.5,149 C289.13,159.38 301.11,169.53 313.19,178.96 " fill="none" id="C_0008931271679944880159&lt;-C_0004757659213119929724" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="244.99,122.17,238.2,102.1,256.03,113.56,244.99,122.17" style="stroke: #A80036; stroke-width: 1.0;"/>
  </g>
 </svg>
--- a/docs/test_cases/t00024_class_mermaid.svg
+++ b/docs/test_cases/t00024_class_mermaid.svg
@@ -96,8 +96,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L6">
-          <g title="Target" id="classId-C_0001116408959993110019-0" class="node default clickable">
+        <a transform="translate(217.8828125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L6">
+          <g title="Target" id="classId-C_0008931271679944880159-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"/>
            <line y2="-4.5" y1="-4.5" x2="65.90625" x1="-65.90625" class="divider"/>
@@ -130,8 +130,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L14">
-          <g title="Target1" id="classId-C_0000669517069151826610-1" class="node default clickable">
+        <a transform="translate(57.9609375, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L14">
+          <g title="Target1" id="classId-C_0005356136553214612884-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"/>
            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -159,8 +159,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L20">
-          <g title="Target2" id="classId-C_0001210513233906695933-2" class="node default clickable">
+        <a transform="translate(207.8828125, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L20">
+          <g title="Target2" id="classId-C_0009684105871253567467-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"/>
            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -188,8 +188,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00024/t00024.cc#L26">
-          <g title="Proxy" id="classId-C_0000594707401639991215-3" class="node default clickable">
+        <a transform="translate(443.1796875, 293.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00024/t00024.cc#L26">
+          <g title="Proxy" id="classId-C_0004757659213119929724-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"/>
            <line y2="-4.5" y1="-4.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
--- a/docs/test_cases/t00025.md
+++ b/docs/test_cases/t00025.md
@@ -66,7 +66,7 @@ public:
    {
      "bases": [],
      "display_name": "Target1",
-      "id": "1573849034571194138",
+      "id": "12590792276569553107",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -141,7 +145,7 @@ public:
    {
      "bases": [],
      "display_name": "Target2",
-      "id": "751896409461834669",
+      "id": "6015171275694677358",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -216,7 +224,7 @@ public:
    {
      "bases": [],
      "display_name": "Proxy<T>",
-      "id": "1483353300536405088",
+      "id": "11866826404291240710",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -342,7 +356,7 @@ public:
    {
      "bases": [],
      "display_name": "Proxy<Target1>",
-      "id": "1644966842838139424",
+      "id": "13159734742705115399",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -363,7 +377,7 @@ public:
          "is_variadic": false,
          "kind": "argument",
          "template_parameters": [],
-          "type": "clanguml::t00025::Target1"
+          "type": "Target1"
        }
      ],
      "type": "class"
@@ -371,7 +385,7 @@ public:
    {
      "bases": [],
      "display_name": "Proxy<Target2>",
-      "id": "1190103100236298763",
+      "id": "9520824801890390106",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -392,7 +406,7 @@ public:
          "is_variadic": false,
          "kind": "argument",
          "template_parameters": [],
-          "type": "clanguml::t00025::Target2"
+          "type": "Target2"
        }
      ],
      "type": "class"
@@ -400,7 +414,7 @@ public:
    {
      "bases": [],
      "display_name": "ProxyHolder",
-      "id": "1906317303950647748",
+      "id": "15250538431605181984",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -450,40 +464,40 @@ public:
  "relationships": [
    {
      "access": "public",
-      "destination": "1573849034571194138",
-      "source": "1644966842838139424",
+      "destination": "12590792276569553107",
+      "source": "13159734742705115399",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1483353300536405088",
-      "source": "1644966842838139424",
+      "destination": "11866826404291240710",
+      "source": "13159734742705115399",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "751896409461834669",
-      "source": "1190103100236298763",
+      "destination": "6015171275694677358",
+      "source": "9520824801890390106",
      "type": "dependency"
    },
    {
      "access": "public",
-      "destination": "1483353300536405088",
-      "source": "1190103100236298763",
+      "destination": "11866826404291240710",
+      "source": "9520824801890390106",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1644966842838139424",
+      "destination": "13159734742705115399",
      "label": "proxy1",
-      "source": "1906317303950647748",
+      "source": "15250538431605181984",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1190103100236298763",
+      "destination": "9520824801890390106",
      "label": "proxy2",
-      "source": "1906317303950647748",
+      "source": "15250538431605181984",
      "type": "aggregation"
    }
  ],
--- 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="fyv19n96d3moz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kmm0fxkl9sm8" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyv19n96d3moz)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kmm0fxkl9sm8)" height="73.6094" id="C_0012590792276569553107" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L8" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L8" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L9" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L9" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyv19n96d3moz)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kmm0fxkl9sm8)" height="73.6094" id="C_0006015171275694677358" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L15" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L15" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyv19n96d3moz)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kmm0fxkl9sm8)" height="107.2188" id="C_0011866826404291240710" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L20" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L20" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L25" xlink:show="new" xlink:title="m2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L25" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyv19n96d3moz)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kmm0fxkl9sm8)" height="48" id="C_0013159734742705115399" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyv19n96d3moz)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kmm0fxkl9sm8)" height="48" id="C_0009520824801890390106" 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,41 +112,41 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyv19n96d3moz)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kmm0fxkl9sm8)" height="73.6094" id="C_0015250538431605181984" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M132.54,207.16 C117.89,227.14 96.41,256.47 78.96,280.29 " fill="none" id="C_0013159734742705115399-&gt;C_0012590792276569553107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="75.97,284.37,84.5201,279.4818,78.9287,280.3393,78.0711,274.7479,75.97,284.37" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M167.14,207.16 C176.66,219.65 188.96,235.79 201.28,251.96 " fill="none" id="C_0001644966842838139424-&gt;C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M167.14,207.16 C176.66,219.65 188.96,235.79 201.28,251.96 " fill="none" id="C_0013159734742705115399-&gt;C_0011866826404291240710" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="206.94,247.84,213.49,267.99,195.81,256.33,206.94,247.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M328.79,207.16 C351.68,227.31 385.35,256.96 412.51,280.88 " fill="none" id="C_0001190103100236298763-&gt;C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M328.79,207.16 C351.68,227.31 385.35,256.96 412.51,280.88 " fill="none" id="C_0009520824801890390106-&gt;C_0006015171275694677358" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="416.47,284.37,412.3646,275.4176,412.7196,281.0633,407.0739,281.4183,416.47,284.37" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M294.19,207.16 C289.98,218.87 284.63,233.79 279.19,248.93 " fill="none" id="C_0001190103100236298763-&gt;C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M294.19,207.16 C289.98,218.87 284.63,233.79 279.19,248.93 " fill="none" id="C_0009520824801890390106-&gt;C_0011866826404291240710" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="285.69,251.53,272.35,267.99,272.52,246.8,285.69,251.53" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M198.65,93.87 C195.23,99.97 191.78,106.13 188.5,112 C179.74,127.67 169.91,145.32 162.31,158.98 " fill="none" id="C_0001906317303950647748&lt;-C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M198.65,93.87 C195.23,99.97 191.78,106.13 188.5,112 C179.74,127.67 169.91,145.32 162.31,158.98 " fill="none" id="C_0015250538431605181984&lt;-C_0013159734742705115399" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="205.13,82.3,198.7072,85.5784,199.2631,92.768,205.6859,89.4896,205.13,82.3" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="194.5" cy="121.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="43" x="201.5" y="125.0669">proxy1</text>
-    <path d="M252.45,93.59 C264.91,115.61 279.15,140.76 289.25,158.6 " fill="none" id="C_0001906317303950647748&lt;-C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M252.45,93.59 C264.91,115.61 279.15,140.76 289.25,158.6 " fill="none" id="C_0015250538431605181984&lt;-C_0009520824801890390106" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="245.93,82.09,245.4025,89.2818,251.8382,92.5348,252.3657,85.343,245.93,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="276.5" cy="121.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="43" x="283.5" y="125.0669">proxy2</text>
--- a/docs/test_cases/t00025_class_mermaid.svg
+++ b/docs/test_cases/t00025_class_mermaid.svg
@@ -126,8 +126,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L6">
-          <g title="Target1" id="classId-C_0001573849034571194138-0" class="node default clickable">
+        <a transform="translate(65.3828125, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L6">
+          <g title="Target1" id="classId-C_0012590792276569553107-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"/>
            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -155,8 +155,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L12">
-          <g title="Target2" id="classId-C_0000751896409461834669-1" class="node default clickable">
+        <a transform="translate(535.9765625, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L12">
+          <g title="Target2" id="classId-C_0006015171275694677358-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"/>
            <line y2="-4.5" y1="-4.5" x2="49.9609375" x1="-49.9609375" class="divider"/>
@@ -184,8 +184,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18">
-          <g title="Proxy" id="classId-C_0001483353300536405088-2" class="node default clickable">
+        <a transform="translate(300.6796875, 356.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18">
+          <g title="Proxy" id="classId-C_0011866826404291240710-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"/>
            <line y2="-4.5" y1="-4.5" x2="135.3359375" x1="-135.3359375" class="divider"/>
@@ -223,8 +223,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18">
-          <g title="Proxy" id="classId-C_0001644966842838139424-3" class="node default clickable">
+        <a transform="translate(75.3828125, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18">
+          <g title="Proxy" id="classId-C_0013159734742705115399-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"/>
            <line y2="17.5" y1="17.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -242,8 +242,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L18">
-          <g title="Proxy" id="classId-C_0001190103100236298763-4" class="node default clickable">
+        <a transform="translate(525.9765625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L18">
+          <g title="Proxy" id="classId-C_0009520824801890390106-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"/>
            <line y2="17.5" y1="17.5" x2="67.3828125" x1="-67.3828125" class="divider"/>
@@ -261,8 +261,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00025/t00025.cc#L31">
-          <g title="ProxyHolder" id="classId-C_0001906317303950647748-5" class="node default clickable">
+        <a transform="translate(300.6796875, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00025/t00025.cc#L31">
+          <g title="ProxyHolder" id="classId-C_0015250538431605181984-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"/>
            <line y2="39.5" y1="39.5" x2="99.328125" x1="-99.328125" class="divider"/>
--- a/docs/test_cases/t00026.md
+++ b/docs/test_cases/t00026.md
@@ -87,7 +87,7 @@ struct StringMemento {
    {
      "bases": [],
      "display_name": "Memento<T>",
-      "id": "1241204213727905390",
+      "id": "9929633709823243122",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -187,7 +191,7 @@ struct StringMemento {
    {
      "bases": [],
      "display_name": "Originator<T>",
-      "id": "1324770803720816727",
+      "id": "10598166429766533816",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -375,7 +389,7 @@ struct StringMemento {
    {
      "bases": [],
      "display_name": "Caretaker<T>",
-      "id": "2032715387182792204",
+      "id": "16261723097462337632",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -484,7 +502,7 @@ struct StringMemento {
    {
      "bases": [],
      "display_name": "Caretaker<std::string>",
-      "id": "1708482137721157489",
+      "id": "13667857101769259918",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -513,7 +531,7 @@ struct StringMemento {
    {
      "bases": [],
      "display_name": "Originator<std::string>",
-      "id": "1014247960805363560",
+      "id": "8113983686442908481",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -542,7 +560,7 @@ struct StringMemento {
    {
      "bases": [],
      "display_name": "StringMemento",
-      "id": "851750942915129289",
+      "id": "6814007543321034313",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -592,41 +610,47 @@ struct StringMemento {
  "relationships": [
    {
      "access": "public",
-      "destination": "1241204213727905390",
-      "source": "1324770803720816727",
+      "destination": "9929633709823243122",
+      "source": "10598166429766533816",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "9929633709823243122",
+      "source": "10598166429766533816",
      "type": "dependency"
    },
    {
      "access": "private",
-      "destination": "1241204213727905390",
+      "destination": "9929633709823243122",
      "label": "m_mementos",
-      "source": "2032715387182792204",
+      "source": "16261723097462337632",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "2032715387182792204",
-      "source": "1708482137721157489",
+      "destination": "16261723097462337632",
+      "source": "13667857101769259918",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1324770803720816727",
-      "source": "1014247960805363560",
+      "destination": "10598166429766533816",
+      "source": "8113983686442908481",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1708482137721157489",
+      "destination": "13667857101769259918",
      "label": "caretaker",
-      "source": "851750942915129289",
+      "source": "6814007543321034313",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1014247960805363560",
+      "destination": "8113983686442908481",
      "label": "originator",
-      "source": "851750942915129289",
+      "source": "6814007543321034313",
      "type": "aggregation"
    }
  ],
--- 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="fc8rlc5dwu619" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzbp805866fgx" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8rlc5dwu619)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzbp805866fgx)" height="94.4141" id="C_0009929633709823243122" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L10" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L10" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L15" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L15" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8rlc5dwu619)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzbp805866fgx)" height="132.8281" id="C_0010598166429766533816" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L23" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L23" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L30" xlink:show="new" xlink:title="load" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L30" target="_top" title="load" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L28" xlink:show="new" xlink:title="memoize_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L28" target="_top" title="memoize_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L32" xlink:show="new" xlink:title="print" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L32" target="_top" title="print" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L34" xlink:show="new" xlink:title="set" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L34" target="_top" title="set" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8rlc5dwu619)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzbp805866fgx)" height="86.4141" id="C_0016261723097462337632" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L44" xlink:show="new" xlink:title="set_state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L44" target="_top" title="set_state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L42" xlink:show="new" xlink:title="state" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L42" target="_top" title="state" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8rlc5dwu619)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzbp805866fgx)" height="48" id="C_0013667857101769259918" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8rlc5dwu619)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzbp805866fgx)" height="48" id="C_0008113983686442908481" 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,43 +145,43 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fc8rlc5dwu619)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzbp805866fgx)" height="73.6094" id="C_0006814007543321034313" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M502.1,401.16 C483.28,424.97 462.34,451.46 444.73,473.73 " fill="none" id="C_0010598166429766533816-&gt;C_0009929633709823243122" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="#A80036" points="441.49,477.84,450.2052,473.2526,444.5873,473.9149,443.925,468.2969,441.49,477.84" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M256.25,386.55 C287.03,414.99 325.06,450.14 354.96,477.77 " fill="none" id="C_0002032715387182792204&lt;-C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M256.25,386.55 C287.03,414.99 325.06,450.14 354.96,477.77 " fill="none" id="C_0016261723097462337632&lt;-C_0009929633709823243122" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="246.53,377.57,248.2235,384.5794,255.3451,385.7121,253.6516,378.7027,246.53,377.57" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="325" y="437.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="335" y="444.0669">m_mementos</text>
-    <path d="M300.82,207.03 C286.43,225.27 265.68,251.55 246.82,275.44 " fill="none" id="C_0001708482137721157489-&gt;C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M300.82,207.03 C286.43,225.27 265.68,251.55 246.82,275.44 " fill="none" id="C_0013667857101769259918-&gt;C_0016261723097462337632" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="252.06,280.11,234.17,291.47,241.07,271.44,252.06,280.11" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M537.08,207.03 C538.6,218.36 540.53,232.81 542.54,247.85 " fill="none" id="C_0001014247960805363560-&gt;C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M537.08,207.03 C538.6,218.36 540.53,232.81 542.54,247.85 " fill="none" id="C_0008113983686442908481-&gt;C_0010598166429766533816" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="549.49,247.02,545.21,267.77,535.62,248.87,549.49,247.02" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M382.71,92.68 C366.85,114.91 348.59,140.52 335.69,158.6 " fill="none" id="C_0000851750942915129289&lt;-C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M382.71,92.68 C366.85,114.91 348.59,140.52 335.69,158.6 " fill="none" id="C_0006814007543321034313&lt;-C_0013667857101769259918" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="390.26,82.09,383.5206,84.6552,383.2964,91.8628,390.0358,89.2976,390.26,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="374" cy="121.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="61" x="381" y="125.0669">caretaker</text>
-    <path d="M455.98,92.08 C475.38,114.44 497.86,140.35 513.7,158.6 " fill="none" id="C_0000851750942915129289&lt;-C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M455.98,92.08 C475.38,114.44 497.86,140.35 513.7,158.6 " fill="none" id="C_0006814007543321034313&lt;-C_0008113983686442908481" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="447.31,82.09,448.2152,89.2441,455.1672,91.16,454.2619,84.006,447.31,82.09" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="491" cy="121.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="61" x="498" y="125.0669">originator</text>
--- a/docs/test_cases/t00026_class_mermaid.svg
+++ b/docs/test_cases/t00026_class_mermaid.svg
@@ -126,8 +126,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L8">
-          <g title="Memento" id="classId-C_0001241204213727905390-0" class="node default clickable">
+        <a transform="translate(378.703125, 602.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L8">
+          <g title="Memento" id="classId-C_0009929633709823243122-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"/>
            <line y2="6.5" y1="6.5" x2="96.0546875" x1="-96.0546875" class="divider"/>
@@ -160,8 +160,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L21">
-          <g title="Originator" id="classId-C_0001324770803720816727-1" class="node default clickable">
+        <a transform="translate(161.5625, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L21">
+          <g title="Originator" id="classId-C_0010598166429766533816-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"/>
            <line y2="-26.5" y1="-26.5" x2="153.5625" x1="-153.5625" class="divider"/>
@@ -209,8 +209,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L40">
-          <g title="Caretaker" id="classId-C_0002032715387182792204-2" class="node default clickable">
+        <a transform="translate(595.84375, 378.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L40">
+          <g title="Caretaker" id="classId-C_0016261723097462337632-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"/>
            <line y2="6.5" y1="6.5" x2="230.71875" x1="-230.71875" class="divider"/>
@@ -243,8 +243,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L40">
-          <g title="Caretaker" id="classId-C_0001708482137721157489-3" class="node default clickable">
+        <a transform="translate(595.84375, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L40">
+          <g title="Caretaker" id="classId-C_0013667857101769259918-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"/>
            <line y2="17.5" y1="17.5" x2="93.3125" x1="-93.3125" class="divider"/>
@@ -262,8 +262,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L21">
-          <g title="Originator" id="classId-C_0001014247960805363560-4" class="node default clickable">
+        <a transform="translate(161.5625, 205.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L21">
+          <g title="Originator" id="classId-C_0008113983686442908481-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"/>
            <line y2="17.5" y1="17.5" x2="95.0625" x1="-95.0625" class="divider"/>
@@ -281,8 +281,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00026/t00026.cc#L53">
-          <g title="StringMemento" id="classId-C_0000851750942915129289-5" class="node default clickable">
+        <a transform="translate(378.703125, 58.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00026/t00026.cc#L53">
+          <g title="StringMemento" id="classId-C_0006814007543321034313-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"/>
            <line y2="39.5" y1="39.5" x2="131.34375" x1="-131.34375" class="divider"/>
--- a/docs/test_cases/t00027.md
+++ b/docs/test_cases/t00027.md
@@ -84,7 +84,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Shape",
-      "id": "1593092483959332221",
+      "id": "12744739871674657768",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -159,7 +163,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Line",
-      "id": "1568932879061562228",
+      "id": "12551463032492497828",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -182,19 +186,19 @@ struct Window {
      "bases": [
        {
          "access": "public",
-          "id": "1593092483959332221",
+          "id": "12744739871674657768",
          "is_virtual": false,
          "name": "clanguml::t00027::Shape"
        },
        {
          "access": "public",
-          "id": "2184609081997324211",
+          "id": "17476872655978593693",
          "is_virtual": false,
          "name": "clanguml::t00027::Line::T<clanguml::t00027::Line>"
        }
      ],
      "display_name": "Line<T<>...>",
-      "id": "142374082478337852",
+      "id": "1138992659826702823",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -250,7 +256,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Text",
-      "id": "1833467466291294724",
+      "id": "14667739730330357797",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -273,19 +279,19 @@ struct Window {
      "bases": [
        {
          "access": "public",
-          "id": "1593092483959332221",
+          "id": "12744739871674657768",
          "is_virtual": false,
          "name": "clanguml::t00027::Shape"
        },
        {
          "access": "public",
-          "id": "2247508827463056747",
+          "id": "17980070619704453980",
          "is_virtual": false,
          "name": "clanguml::t00027::Text::T<clanguml::t00027::Text>"
        }
      ],
      "display_name": "Text<T<>...>",
-      "id": "1114634647721878603",
+      "id": "8917077181775028830",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -341,7 +349,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "ShapeDecorator",
-      "id": "2049188825706164566",
+      "id": "16393510605649316529",
      "is_abstract": true,
      "is_nested": false,
      "is_struct": true,
@@ -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"
        }
      ],
@@ -391,13 +401,13 @@ struct Window {
      "bases": [
        {
          "access": "public",
-          "id": "2049188825706164566",
+          "id": "16393510605649316529",
          "is_virtual": false,
          "name": "clanguml::t00027::ShapeDecorator"
        }
      ],
      "display_name": "Color<T>",
-      "id": "1473536569433029444",
+      "id": "11788292555464235555",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -454,13 +466,13 @@ struct Window {
      "bases": [
        {
          "access": "public",
-          "id": "2049188825706164566",
+          "id": "16393510605649316529",
          "is_virtual": false,
          "name": "clanguml::t00027::ShapeDecorator"
        }
      ],
      "display_name": "Weight<T>",
-      "id": "2049455532387561338",
+      "id": "16395644259100490706",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -516,7 +530,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Line<Color,Weight>",
-      "id": "2082936326417164202",
+      "id": "16663490611337313620",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -551,7 +565,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Line<Color>",
-      "id": "675132943535054947",
+      "id": "5401063548280439576",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -580,7 +594,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Text<Color,Weight>",
-      "id": "1678874302644303776",
+      "id": "13430994421154430212",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -615,7 +629,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Text<Color>",
-      "id": "1887786688778664182",
+      "id": "15102293510229313461",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -644,7 +658,7 @@ struct Window {
    {
      "bases": [],
      "display_name": "Window",
-      "id": "1373544984027721472",
+      "id": "10988359872221771779",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -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": [],
@@ -718,90 +732,90 @@ struct Window {
  "relationships": [
    {
      "access": "public",
-      "destination": "1593092483959332221",
-      "source": "142374082478337852",
+      "destination": "12744739871674657768",
+      "source": "1138992659826702823",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "2184609081997324211",
-      "source": "142374082478337852",
+      "destination": "17476872655978593693",
+      "source": "1138992659826702823",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "1593092483959332221",
-      "source": "1114634647721878603",
+      "destination": "12744739871674657768",
+      "source": "8917077181775028830",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "2247508827463056747",
-      "source": "1114634647721878603",
+      "destination": "17980070619704453980",
+      "source": "8917077181775028830",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "2049188825706164566",
-      "source": "1473536569433029444",
+      "destination": "16393510605649316529",
+      "source": "11788292555464235555",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "2049188825706164566",
-      "source": "2049455532387561338",
+      "destination": "16393510605649316529",
+      "source": "16395644259100490706",
      "type": "extension"
    },
    {
      "access": "public",
-      "destination": "142374082478337852",
-      "source": "2082936326417164202",
+      "destination": "1138992659826702823",
+      "source": "16663490611337313620",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "142374082478337852",
-      "source": "675132943535054947",
+      "destination": "1138992659826702823",
+      "source": "5401063548280439576",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1114634647721878603",
-      "source": "1678874302644303776",
+      "destination": "8917077181775028830",
+      "source": "13430994421154430212",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "1114634647721878603",
-      "source": "1887786688778664182",
+      "destination": "8917077181775028830",
+      "source": "15102293510229313461",
      "type": "instantiation"
    },
    {
      "access": "public",
-      "destination": "2082936326417164202",
+      "destination": "16663490611337313620",
      "label": "border",
-      "source": "1373544984027721472",
+      "source": "10988359872221771779",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "675132943535054947",
+      "destination": "5401063548280439576",
      "label": "divider",
-      "source": "1373544984027721472",
+      "source": "10988359872221771779",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1678874302644303776",
+      "destination": "13430994421154430212",
      "label": "title",
-      "source": "1373544984027721472",
+      "source": "10988359872221771779",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "1887786688778664182",
+      "destination": "15102293510229313461",
      "label": "description",
-      "source": "1373544984027721472",
+      "source": "10988359872221771779",
      "type": "aggregation"
    }
  ],
--- 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="f17w4y21ikjifu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1pxjkkshkk1dl" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="81.6094" id="C_0012744739871674657768" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L11" xlink:show="new" xlink:title="~Shape" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L11" target="_top" title="~Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L10" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L10" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="48" id="C_0012551463032492497828" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="60.8047" id="C_0001138992659826702823" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L17" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L17" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="48" id="C_0014667739730330357797" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="60.8047" id="C_0008917077181775028830" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L27" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L27" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="60.8047" id="C_0016393510605649316529" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L35" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L35" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="60.8047" id="C_0011788292555464235555" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L40" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L40" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="60.8047" id="C_0016395644259100490706" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L45" xlink:show="new" xlink:title="display" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L45" target="_top" title="display" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="48" id="C_0016663490611337313620" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="48" id="C_0005401063548280439576" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="48" id="C_0013430994421154430212" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="48" id="C_0015102293510229313461" 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,71 +171,71 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17w4y21ikjifu)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pxjkkshkk1dl)" height="99.2188" id="C_0010988359872221771779" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <path d="M340.09,276.44 C311.19,293.5 279.87,311.99 254.63,326.9 " fill="none" id="C_0012744739871674657768&lt;-C_0001138992659826702823" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="336.91,270.18,357.69,266.04,344.03,282.24,336.91,270.18" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M510.91,276.44 C539.81,293.5 571.13,311.99 596.37,326.9 " fill="none" id="C_0001593092483959332221&lt;-C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M510.91,276.44 C539.81,293.5 571.13,311.99 596.37,326.9 " fill="none" id="C_0012744739871674657768&lt;-C_0008917077181775028830" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="506.97,282.24,493.31,266.04,514.09,270.18,506.97,282.24" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1127.63,106.48 C1115.27,134.89 1100,169.98 1089.38,194.39 " fill="none" id="C_0002049188825706164566&lt;-C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1127.63,106.48 C1115.27,134.89 1100,169.98 1089.38,194.39 " fill="none" id="C_0016393510605649316529&lt;-C_0011788292555464235555" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="1121.23,103.64,1135.63,88.09,1134.07,109.22,1121.23,103.64" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M1169.37,106.48 C1181.73,134.89 1197,169.98 1207.62,194.39 " fill="none" id="C_0002049188825706164566&lt;-C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1169.37,106.48 C1181.73,134.89 1197,169.98 1207.62,194.39 " fill="none" id="C_0016393510605649316529&lt;-C_0016395644259100490706" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="none" points="1162.93,109.22,1161.37,88.09,1175.77,103.64,1162.93,109.22" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M204.5,249.03 C204.5,265.02 204.5,286.94 204.5,306.81 " fill="none" id="C_0002082936326417164202-&gt;C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M204.5,249.03 C204.5,265.02 204.5,286.94 204.5,306.81 " fill="none" id="C_0016663490611337313620-&gt;C_0001138992659826702823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="211.5,306.82,204.5,326.82,197.5,306.82,211.5,306.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M79.32,249.03 C100.12,266.88 129.52,292.12 154.6,313.66 " fill="none" id="C_0000675132943535054947-&gt;C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M79.32,249.03 C100.12,266.88 129.52,292.12 154.6,313.66 " fill="none" id="C_0005401063548280439576-&gt;C_0001138992659826702823" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="159.32,308.48,169.93,326.82,150.2,319.1,159.32,308.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M646.5,249.03 C646.5,265.02 646.5,286.94 646.5,306.81 " fill="none" id="C_0001678874302644303776-&gt;C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M646.5,249.03 C646.5,265.02 646.5,286.94 646.5,306.81 " fill="none" id="C_0013430994421154430212-&gt;C_0008917077181775028830" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="653.5,306.82,646.5,326.82,639.5,306.82,653.5,306.82" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M772.5,249.03 C751.57,266.88 721.98,292.12 696.73,313.66 " fill="none" id="C_0001887786688778664182-&gt;C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M772.5,249.03 C751.57,266.88 721.98,292.12 696.73,313.66 " fill="none" id="C_0015102293510229313461-&gt;C_0008917077181775028830" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="701.06,319.17,681.3,326.82,691.97,308.52,701.06,319.17" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M374.27,114.25 C328.47,143.86 274.65,178.65 240.08,201 " fill="none" id="C_0001373544984027721472&lt;-C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M374.27,114.25 C328.47,143.86 274.65,178.65 240.08,201 " fill="none" id="C_0010988359872221771779&lt;-C_0016663490611337313620" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="385.42,107.04,378.2097,106.9346,375.3392,113.5497,382.5495,113.6551,385.42,107.04" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="338.5" cy="146.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="42" x="345.5" y="150.0669">border</text>
-    <path d="M353.7,91.06 C284.55,113.69 193.4,146.45 116.5,184 C106.49,188.89 96.07,194.94 86.62,200.84 " fill="none" id="C_0001373544984027721472&lt;-C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M353.7,91.06 C284.55,113.69 193.4,146.45 116.5,184 C106.49,188.89 96.07,194.94 86.62,200.84 " fill="none" id="C_0010988359872221771779&lt;-C_0005401063548280439576" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="366.35,86.96,359.4084,85.0071,354.9358,90.6637,361.8775,92.6166,366.35,86.96" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="224.5" cy="146.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="42" x="231.5" y="150.0669">divider</text>
-    <path d="M525.06,115.94 C557.91,145.18 596.01,179.08 620.65,201 " fill="none" id="C_0001373544984027721472&lt;-C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M525.06,115.94 C557.91,145.18 596.01,179.08 620.65,201 " fill="none" id="C_0010988359872221771779&lt;-C_0013430994421154430212" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="515.05,107.04,516.8738,114.0167,524.0153,115.0165,522.1915,108.0398,515.05,107.04" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="571.5" cy="146.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="24" x="578.5" y="150.0669">title</text>
-    <path d="M566.91,103.61 C618.27,126.3 680.35,155.07 734.5,184 C744.2,189.18 754.44,195.21 763.86,200.99 " fill="none" id="C_0001373544984027721472&lt;-C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M566.91,103.61 C618.27,126.3 680.35,155.07 734.5,184 C744.2,189.18 754.44,195.21 763.86,200.99 " fill="none" id="C_0010988359872221771779&lt;-C_0015102293510229313461" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="554.77,98.28,558.648,104.3596,565.7514,103.1182,561.8734,97.0386,554.77,98.28" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="674.5" cy="146.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="70" x="681.5" y="150.0669">description</text>
--- a/docs/test_cases/t00027_class_mermaid.svg
+++ b/docs/test_cases/t00027_class_mermaid.svg
@@ -190,8 +190,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L8">
-          <g title="Shape" id="classId-C_0001593092483959332221-0" class="node default clickable">
+        <a transform="translate(142.2421875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L8">
+          <g title="Shape" id="classId-C_0012744739871674657768-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"/>
            <line y2="6.5" y1="6.5" x2="134.2421875" x1="-134.2421875" class="divider"/>
@@ -219,8 +219,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15">
-          <g title="Line" id="classId-C_0001568932879061562228-1" class="node default clickable">
+        <a transform="translate(239.0234375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15">
+          <g title="Line" id="classId-C_0012551463032492497828-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"/>
            <line y2="17.5" y1="17.5" x2="23.9453125" x1="-23.9453125" class="divider"/>
@@ -238,8 +238,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15">
-          <g title="Line" id="classId-C_0000142374082478337852-2" class="node default clickable">
+        <a transform="translate(763.9609375, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15">
+          <g title="Line" id="classId-C_0001138992659826702823-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"/>
            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -262,8 +262,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25">
-          <g title="Text" id="classId-C_0001833467466291294724-3" class="node default clickable">
+        <a transform="translate(336.328125, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25">
+          <g title="Text" id="classId-C_0014667739730330357797-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"/>
            <line y2="17.5" y1="17.5" x2="23.359375" x1="-23.359375" class="divider"/>
@@ -281,8 +281,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25">
-          <g title="Text" id="classId-C_0001114634647721878603-4" class="node default clickable">
+        <a transform="translate(1136.6796875, 433.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25">
+          <g title="Text" id="classId-C_0008917077181775028830-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"/>
            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -305,8 +305,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L34">
-          <g title="ShapeDecorator" id="classId-C_0002049188825706164566-5" class="node default clickable">
+        <a transform="translate(478.984375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L34">
+          <g title="ShapeDecorator" id="classId-C_0016393510605649316529-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"/>
            <line y2="17.5" y1="17.5" x2="69.296875" x1="-69.296875" class="divider"/>
@@ -329,8 +329,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L38">
-          <g title="Color" id="classId-C_0001473536569433029444-6" class="node default clickable">
+        <a transform="translate(390.234375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L38">
+          <g title="Color" id="classId-C_0011788292555464235555-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"/>
            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -353,8 +353,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L43">
-          <g title="Weight" id="classId-C_0002049455532387561338-7" class="node default clickable">
+        <a transform="translate(567.734375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L43">
+          <g title="Weight" id="classId-C_0016395644259100490706-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"/>
            <line y2="6.5" y1="6.5" x2="63.75" x1="-63.75" class="divider"/>
@@ -377,8 +377,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15">
-          <g title="Line" id="classId-C_0002082936326417164202-8" class="node default clickable">
+        <a transform="translate(763.9609375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15">
+          <g title="Line" id="classId-C_0016663490611337313620-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"/>
            <line y2="17.5" y1="17.5" x2="82.4765625" x1="-82.4765625" class="divider"/>
@@ -396,8 +396,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L15">
-          <g title="Line" id="classId-C_0000675132943535054947-9" class="node default clickable">
+        <a transform="translate(950.6171875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L15">
+          <g title="Line" id="classId-C_0005401063548280439576-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"/>
            <line y2="17.5" y1="17.5" x2="54.1796875" x1="-54.1796875" class="divider"/>
@@ -415,8 +415,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25">
-          <g title="Text" id="classId-C_0001678874302644303776-10" class="node default clickable">
+        <a transform="translate(1136.6796875, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25">
+          <g title="Text" id="classId-C_0013430994421154430212-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"/>
            <line y2="17.5" y1="17.5" x2="81.8828125" x1="-81.8828125" class="divider"/>
@@ -434,8 +434,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L25">
-          <g title="Text" id="classId-C_0001887786688778664182-11" class="node default clickable">
+        <a transform="translate(1322.1484375, 282.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L25">
+          <g title="Text" id="classId-C_0015102293510229313461-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"/>
            <line y2="17.5" y1="17.5" x2="53.5859375" x1="-53.5859375" class="divider"/>
@@ -453,8 +453,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00027/t00027.cc#L48">
-          <g title="Window" id="classId-C_0001373544984027721472-12" class="node default clickable">
+        <a transform="translate(1043.6484375, 80.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00027/t00027.cc#L48">
+          <g title="Window" id="classId-C_0010988359872221771779-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"/>
            <line y2="61.5" y1="61.5" x2="112.0859375" x1="-112.0859375" class="divider"/>
--- a/docs/test_cases/t00028.md
+++ b/docs/test_cases/t00028.md
@@ -97,7 +97,7 @@ class R {
        "raw": "/// \\uml{note[top] A class note.}"
      },
      "display_name": "A",
-      "id": "1519850480962783588",
+      "id": "12158803847702268707",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -123,7 +123,7 @@ class R {
        "raw": "/// \\uml{note[] B class note.}"
      },
      "display_name": "B",
-      "id": "1980597091567213070",
+      "id": "15844776732537704560",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -149,7 +149,7 @@ class R {
        "raw": "///\n/// @uml{note:t00028_class[bottom] C class note.}\n/// This is class C."
      },
      "display_name": "C",
-      "id": "984577258575112753",
+      "id": "7876618068600902026",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -175,7 +175,7 @@ class R {
        "raw": "/// \\uml{note\n/// D\n/// class\n/// note.}"
      },
      "display_name": "D",
-      "id": "1263778658518784070",
+      "id": "10110229268150272562",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -201,7 +201,7 @@ class R {
        "raw": "/// \\uml{note E template class note.}"
      },
      "display_name": "E<T>",
-      "id": "1014136565447389473",
+      "id": "8113092523579115786",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -247,7 +247,7 @@ class R {
        "raw": "/// \\uml{note:other_diagram[left] G class note.}"
      },
      "display_name": "G",
-      "id": "764713728396057122",
+      "id": "6117709827168456983",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -277,7 +277,7 @@ class R {
        "three"
      ],
      "display_name": "F",
-      "id": "589227897266388677",
+      "id": "4713823178131109419",
      "is_nested": false,
      "name": "F",
      "namespace": "clanguml::t00028",
@@ -292,7 +292,7 @@ class R {
    {
      "bases": [],
      "display_name": "E<int>",
-      "id": "1949673179441298667",
+      "id": "15597385435530389340",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -325,7 +325,7 @@ class R {
        "raw": "/// \\uml{note[right] R class note.}"
      },
      "display_name": "R",
-      "id": "1189142882239313116",
+      "id": "9513143057914504932",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -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"
        }
      ],
@@ -463,50 +465,50 @@ class R {
  "relationships": [
    {
      "access": "public",
-      "destination": "1014136565447389473",
-      "source": "1949673179441298667",
+      "destination": "8113092523579115786",
+      "source": "15597385435530389340",
      "type": "instantiation"
    },
    {
      "access": "private",
-      "destination": "1519850480962783588",
+      "destination": "12158803847702268707",
      "label": "aaa",
-      "source": "1189142882239313116",
+      "source": "9513143057914504932",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1980597091567213070",
+      "destination": "15844776732537704560",
      "label": "bbb",
-      "source": "1189142882239313116",
+      "source": "9513143057914504932",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "984577258575112753",
+      "destination": "7876618068600902026",
      "label": "ccc",
-      "source": "1189142882239313116",
+      "source": "9513143057914504932",
      "type": "association"
    },
    {
      "access": "private",
-      "destination": "1263778658518784070",
+      "destination": "10110229268150272562",
      "label": "ddd",
-      "source": "1189142882239313116",
+      "source": "9513143057914504932",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "1949673179441298667",
+      "destination": "15597385435530389340",
      "label": "eee",
-      "source": "1189142882239313116",
+      "source": "9513143057914504932",
      "type": "aggregation"
    },
    {
      "access": "private",
-      "destination": "764713728396057122",
+      "destination": "6117709827168456983",
      "label": "ggg",
-      "source": "1189142882239313116",
+      "source": "9513143057914504932",
      "type": "association"
    }
  ],
--- 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="fwph5u6ayab4p" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1utsgz8fmulnp" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="48" id="C_0012158803847702268707" 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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="48" id="C_0015844776732537704560" 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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="48" id="C_0007876618068600902026" 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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="48" id="C_0010110229268150272562" 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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="60.8047" id="C_0008113092523579115786" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="48" id="C_0006117709827168456983" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="86.4141" id="C_0004713823178131109419" 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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="48" id="C_0015597385435530389340" 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,95 +107,95 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fwph5u6ayab4p)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1utsgz8fmulnp)" height="137.6328" id="C_0009513143057914504932" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L37" xlink:show="new" xlink:title="R" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L37" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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(#fwph5u6ayab4p)" 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(#f1utsgz8fmulnp)" 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;"/>
+    <path d="M514.76,274.62 C521.16,287.75 529.42,304.71 537.16,320.59 " fill="none" id="C_0015597385435530389340-&gt;C_0008113092523579115786" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
    <polygon fill="none" points="543.55,317.72,546.01,338.76,530.96,323.85,543.55,317.72" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M365.3,143.53 C363.36,144.36 361.42,145.19 359.5,146 C265.23,185.85 149.8,226.61 103.81,242.53 " fill="none" id="C_0001189142882239313116&lt;-C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M365.3,143.53 C363.36,144.36 361.42,145.19 359.5,146 C265.23,185.85 149.8,226.61 103.81,242.53 " fill="none" id="C_0009513143057914504932&lt;-C_0012158803847702268707" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="377.33,138.3,370.2322,137.0269,366.327,143.0891,373.4249,144.3622,377.33,138.3" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="287.5" y="182.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="297.5" y="189.0669">aaa</text>
-    <path d="M592.35,146.03 C632.47,176.74 676.73,210.63 703.31,230.98 " fill="none" id="C_0001189142882239313116-&gt;C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M592.35,146.03 C632.47,176.74 676.73,210.63 703.31,230.98 " fill="none" id="C_0009513143057914504932-&gt;C_0015844776732537704560" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="707.42,234.13,702.689,225.4918,703.4442,231.0981,697.8379,231.8532,707.42,234.13" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="652.5" y="182.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="662.5" y="189.0669">bbb</text>
-    <path d="M418.61,146.03 C380.73,176.39 338.98,209.85 313.5,230.27 " fill="none" id="C_0001189142882239313116-&gt;C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M418.61,146.03 C380.73,176.39 338.98,209.85 313.5,230.27 " fill="none" id="C_0009513143057914504932-&gt;C_0007876618068600902026" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="309.55,233.43,319.0732,230.9185,313.4502,230.3013,314.0673,224.6782,309.55,233.43" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="380.5" y="182.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="21" x="390.5" y="189.0669">ccc</text>
-    <path d="M641.51,143.88 C643.18,144.59 644.85,145.3 646.5,146 C736.91,184.22 766.27,177.98 853.5,223 C859.61,226.15 865.91,230.09 871.62,233.96 " fill="none" id="C_0001189142882239313116&lt;-C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M641.51,143.88 C643.18,144.59 644.85,145.3 646.5,146 C736.91,184.22 766.27,177.98 853.5,223 C859.61,226.15 865.91,230.09 871.62,233.96 " fill="none" id="C_0009513143057914504932&lt;-C_0010110229268150272562" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="629.55,138.68,633.4551,144.7422,640.553,143.4691,636.6478,137.4069,629.55,138.68" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="787.5" y="182.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="797.5" y="189.0669">ddd</text>
-    <path d="M503.5,159.39 C503.5,183.89 503.5,208.87 503.5,226.29 " fill="none" id="C_0001189142882239313116&lt;-C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M503.5,159.39 C503.5,183.89 503.5,208.87 503.5,226.29 " fill="none" id="C_0009513143057914504932&lt;-C_0015597385435530389340" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="503.5,146.27,499.5,152.27,503.5,158.27,507.5,152.27,503.5,146.27" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="506.5" y="182.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="516.5" y="189.0669">eee</text>
-    <path d="M469.26,146.27 C456.02,172.67 441.63,201.38 431.39,221.81 " fill="none" id="C_0001189142882239313116-&gt;C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M469.26,146.27 C456.02,172.67 441.63,201.38 431.39,221.81 " fill="none" id="C_0009513143057914504932-&gt;C_0006117709827168456983" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="429.14,226.29,436.7506,220.0387,431.3818,221.8207,429.5998,216.4519,429.14,226.29" style="stroke: #A80036; stroke-width: 1.0;"/>
    <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="456.5" y="182.0664"/>
    <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="466.5" y="189.0669">ggg</text>
--- a/docs/test_cases/t00028_class_mermaid.svg
+++ b/docs/test_cases/t00028_class_mermaid.svg
@@ -218,8 +218,8 @@
        </g>
      </g>
      <g class="nodes">
-        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L8">
-          <g title="A" id="classId-C_0001519850480962783588-0" class="node default clickable">
+        <a transform="translate(232.609375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L8">
+          <g title="A" id="classId-C_0012158803847702268707-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -237,8 +237,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L11">
-          <g title="B" id="classId-C_0001980597091567213070-1" class="node default clickable">
+        <a transform="translate(406.78125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L11">
+          <g title="B" id="classId-C_0015844776732537704560-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -256,8 +256,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L16">
-          <g title="C" id="classId-C_0000984577258575112753-2" class="node default clickable">
+        <a transform="translate(600.7578125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L16">
+          <g title="C" id="classId-C_0007876618068600902026-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -275,8 +275,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L22">
-          <g title="D" id="classId-C_0001263778658518784070-3" class="node default clickable">
+        <a transform="translate(946.40234375, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L22">
+          <g title="D" id="classId-C_0010110229268150272562-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"/>
            <line y2="17.5" y1="17.5" x2="13.28125" x1="-13.28125" class="divider"/>
@@ -294,8 +294,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L25">
-          <g title="E" id="classId-C_0001014136565447389473-4" class="node default clickable">
+        <a transform="translate(1253.1015625, 516.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L25">
+          <g title="E" id="classId-C_0008113092523579115786-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"/>
            <line y2="28.5" y1="28.5" x2="44.25" x1="-44.25" class="divider"/>
@@ -318,8 +318,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L30">
-          <g title="G" id="classId-C_0000764713728396057122-5" class="node default clickable">
+        <a transform="translate(1028.9296875, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L30">
+          <g title="G" id="classId-C_0006117709827168456983-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"/>
            <line y2="17.5" y1="17.5" x2="13.7265625" x1="-13.7265625" class="divider"/>
@@ -337,8 +337,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L33">
-          <g title="F" id="classId-C_0000589227897266388677-6" class="node default clickable">
+        <a transform="translate(68.875, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L33">
+          <g title="F" id="classId-C_0004713823178131109419-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"/>
            <line y2="61.5" y1="61.5" x2="60.875" x1="-60.875" class="divider"/>
@@ -371,8 +371,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L25">
-          <g title="E" id="classId-C_0001949673179441298667-7" class="node default clickable">
+        <a transform="translate(1347.03125, 398.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L25">
+          <g title="E" id="classId-C_0015597385435530389340-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"/>
            <line y2="17.5" y1="17.5" x2="31.953125" x1="-31.953125" class="divider"/>
@@ -390,8 +390,8 @@
            </g>
          </g>
        </a>
-        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00028/t00028.cc#L36">
-          <g title="R" id="classId-C_0001189142882239313116-8" class="node default clickable">
+        <a transform="translate(794.4765625, 196.5)" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00028/t00028.cc#L36">
+          <g title="R" id="classId-C_0009513143057914504932-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"/>
            <line y2="72.5" y1="72.5" x2="144.9140625" x1="-144.9140625" class="divider"/>
--- a/docs/test_cases/t00029.md
+++ b/docs/test_cases/t00029.md
@@ -76,7 +76,7 @@ struct R {
    {
      "bases": [],
      "display_name": "A",
-      "id": "1970994826766369014",
+      "id": "15767958614130952114",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -98,7 +98,7 @@ struct R {
    {
      "bases": [],
      "display_name": "C<T>",
-      "id": "543766389270348470",
+      "id": "4350131114162787762",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -144,7 +144,7 @@ struct R {
        "raw": "/// @uml{skip:t00029_class}"
      },
      "display_name": "D",
-      "id": "1496914969429483234",
+      "id": "11975319755435865873",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -183,7 +183,7 @@ struct R {
        "three"
      ],
      "display_name": "E",
-      "id": "1936873082456592219",
+      "id": "15494984659652737759",
      "is_nested": false,
      "name": "E",
      "namespace": "clanguml::t00029",
@@ -198,7 +198,7 @@ struct R {
    {
      "bases": [],
      "display_name": "G1",
-      "id": "1980718063838190763",
+      "id": "15845744510705526108",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -220,7 +220,7 @@ struct R {
    {
      "bases": [],
      "display_name": "G2",
-      "id": "2204627213593766591",
+      "id": "17637017708750132732",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -242,7 +242,7 @@ struct R {
    {
      "bases": [],
      "display_name": "G3",
-      "id": "767180516665070631",
+      "id": "6137444133320565051",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -264,7 +264,7 @@ struct R {
    {
      "bases": [],
      "display_name": "G4",
-      "id": "715074622924270214",
+      "id": "5720596983394161714",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": false,
@@ -286,7 +286,7 @@ struct R {
    {
      "bases": [],
      "display_name": "R",
-      "id": "348749731659902910",
+      "id": "2789997853279223281",
      "is_abstract": false,
      "is_nested": false,
      "is_struct": true,
@@ -352,16 +352,23 @@ struct R {
  "relationships": [
    {
      "access": "public",
-      "destination": "1980718063838190763",
+      "destination": "15845744510705526108",
      "label": "g1",
-      "source": "348749731659902910",
+      "source": "2789997853279223281",
      "type": "aggregation"
    },
    {
      "access": "public",
-      "destination": "715074622924270214",
+      "destination": "5720596983394161714",
      "label": "g4",
-      "source": "348749731659902910",
+      "source": "2789997853279223281",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "5720596983394161714",
+      "label": "g4",
+      "source": "2789997853279223281",
      "type": "association"
    }
  ],
--- 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="f1dhf0wrg84g3g" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wi4k2blkghj9" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="48" id="C_0015767958614130952114" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="60.8047" id="C_0004350131114162787762" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="60.8047" id="C_0011975319755435865873" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L18" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L18" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="86.4141" id="C_0015494984659652737759" 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,72 +60,72 @@
      <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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="48" id="C_0015845744510705526108" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="48" id="C_0017637017708750132732" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="48" id="C_0006137444133320565051" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="48" id="C_0005720596983394161714" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhf0wrg84g3g)" 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/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wi4k2blkghj9)" height="86.4141" id="C_0002789997853279223281" 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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/87ef0292497185f96a5d519ca3d089e4deef7f8d/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/e41b0da6776e43f4d4f0bb41619a04e152c35cb6/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;"/>
+    <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_0002789997853279223281&lt;-C_0015845744510705526108" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#FFFFFF" points="382.43,94.31,376.5162,98.4364,378.0507,105.4824,383.9645,101.3559,382.43,94.31" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="378" cy="133.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="16" x="385" y="137.0669">g1</text>
-    <path d="M414.04,94.3 C421.51,122.95 431.17,160 437.7,185.03 " fill="none" id="C_0000348749731659902910-&gt;C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M414.04,94.3 C421.51,122.95 431.17,160 437.7,185.03 " fill="none" id="C_0002789997853279223281-&gt;C_0005720596983394161714" style="stroke: #A80036; stroke-width: 1.0;"/>
    <polygon fill="#A80036" points="438.97,189.87,440.5803,180.1537,437.7137,185.0304,432.837,182.1638,438.97,189.87" style="stroke: #A80036; stroke-width: 1.0;"/>
    <ellipse cx="432" cy="133.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="16" x="439" y="137.0669">g4</text>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bartek Kryza	3b10885155	Added Makefile option to build with address sanitizer	2024-07-12 16:58:13 +02:00
Bartek Kryza	c0f5d5f64a	Added CLANG_UML_ENABLE_BACKTRACE CMake option to enable backtrace in release builds (#292 )	2024-06-21 23:52:33 +02:00
Bartek Kryza	2c23627154	Merge pull request #291 from bkryza/v0.5.3 V0.5.3	2024-06-19 21:58:11 +02:00
Bartek Kryza	349db60c6b	Updated test cases documentation	2024-06-19 18:26:38 +02:00
Bartek Kryza	e41b0da677	Updated version to 0.5.3	2024-06-19 18:23:15 +02:00
Bartek Kryza	4b6e6717a5	Updated util/test_llvm_versions.sh script	2024-06-19 17:56:40 +02:00
Bartek Kryza	fdfd89ace8	Updated test cases documentation	2024-06-18 22:25:19 +02:00
Bartek Kryza	9a43ebe739	Fixed handling of relationships to nested structs	2024-06-18 22:00:50 +02:00
Bartek Kryza	fa94022c58	Merge pull request #290 from bkryza/add-context-diagram-relationship-direction Add context diagram relationship direction	2024-06-17 22:08:54 +02:00
Bartek Kryza	632e170ab4	Updated test cases documentation	2024-06-17 22:02:29 +02:00
Bartek Kryza	c45830f35a	Updated CHANGELOG	2024-06-17 21:50:30 +02:00
Bartek Kryza	7c75f0e6d2	Updated context filter docs (#274 )	2024-06-17 21:49:11 +02:00
Bartek Kryza	e7eadc03a2	Added context exclude filter with relationships option test case (#274 )	2024-06-17 18:59:23 +02:00
Bartek Kryza	6952c3296d	Added context filter relationships option (#274 )	2024-06-13 21:35:11 +02:00
Bartek Kryza	db2bd0417a	Extended context filter inward test case with nested class (#274 )	2024-06-13 20:13:41 +02:00
Bartek Kryza	dca616328c	Added test case for context filter outward direction (#274 )	2024-06-13 18:55:30 +02:00
Bartek Kryza	30337c1aa3	Extended context filter inward test case to larger radius (#274 )	2024-06-13 17:29:34 +02:00
Bartek Kryza	bd921822c2	Added relationship direction flag to context diagram filter (#274 )	2024-06-13 14:19:56 +02:00
Bartek Kryza	7d859db15a	Fixed unused-but-set-parameter in GCC	2024-06-10 21:35:43 +02:00
Bartek Kryza	7e29453cb4	Merge pull request #288 from bkryza/improve-test-coverage Improve test coverage	2024-06-10 20:46:33 +02:00
Bartek Kryza	4f9a09783f	Fixed building on MSVC (#287 )	2024-06-10 20:09:13 +02:00
Bartek Kryza	fa742a03c4	Improved test coverage (#287 )	2024-06-10 15:51:27 +02:00
Bartek Kryza	514c439413	Changed std::tmpnam (deprecated) to a custom random name generator in cli tests	2024-06-09 22:37:34 +02:00
Bartek Kryza	94f5f445ee	Improved test coverage (#287 )	2024-06-09 21:10:09 +02:00
Bartek Kryza	82846dcc27	Extended cli_handler test cases (#287 )	2024-06-08 13:29:22 +02:00
Bartek Kryza	beba7d16b9	Added test case for sequence diagram with nested classes (#287 )	2024-06-07 19:45:15 +02:00
Bartek Kryza	5de512ad0b	Improved error logging (#284 )	2024-06-07 00:25:03 +02:00
Bartek Kryza	a66bbff900	Merge pull request #286 from hatch01/master packaging: add nixpkgs avalability and make wrapped script the default	2024-06-06 21:00:04 +02:00
eymeric	37334d54cc	small nix packaging shell completion cleanup	2024-06-06 20:51:12 +02:00
eymeric	aec9d553dd	packaging: now wrapped is the default for nix	2024-06-06 20:48:06 +02:00
eymeric	1393afc146	doc: add nix version info	2024-06-06 17:29:00 +02:00
eymeric	ed6b78022a	doc: add nixpkgs avalability	2024-06-06 15:26:36 +02:00
Bartek Kryza	6a1322b04c	Merge pull request #285 from bkryza/refactor-id_t	2024-06-06 00:14:26 +02:00
Bartek Kryza	cfea6d97e7	Fixed building on macos	2024-06-05 23:21:33 +02:00
Bartek Kryza	420475ab64	Renamed common::id_t to eid_t to avoid conflicts with system id_t	2024-06-05 22:01:13 +02:00
Bartek Kryza	2cf9d2f22a	Added test case for common::id_t	2024-06-05 00:15:21 +02:00
Bartek Kryza	a6a92c3543	Updated to clang-tidy-17	2024-06-04 23:49:42 +02:00
Bartek Kryza	50851531f9	Fixed clang-tidy warnings	2024-06-04 22:50:53 +02:00
Bartek Kryza	1c9f347c91	Refactored id_t to types.cpp	2024-06-04 21:01:45 +02:00
Bartek Kryza	a69938f17f	Fixed tests after initial refactor	2024-06-04 20:49:50 +02:00
Bartek Kryza	cf79b3184c	Initial refactor of id_t to a separate class	2024-06-04 00:03:26 +02:00
Bartek Kryza	e21c2d2b14	Updated test cases documentation	2024-06-03 17:14:26 +02:00
Bartek Kryza	2e861ee3de	Fixed handling of relationships to nested enums (#280 )	2024-06-03 16:59:26 +02:00
Bartek Kryza	cbaf5f65a0	Updated test cases documentation	2024-06-01 19:23:16 +02:00
Bartek Kryza	ff7edef585	Fixed handling of multiple dimension arrays in class fields (#278 )	2024-06-01 19:05:54 +02:00
Bartek Kryza	d599bb6715	Fixed handling of nested anonymous arrays of structs	2024-06-01 14:23:38 +02:00
Bartek Kryza	c9b3f92dbe	Merge pull request #277 from pogobanane/dev/unnamed-undeclared fix segfault in name for unnamed undeclared types	2024-06-01 14:11:47 +02:00
Pogobanane	3cff6593e6	fix name for unnamed undeclared types type->getAsTagDecl() may return null, e.g. in the following example: struct Foo { struct { uint64_t len; uint64_t flags; } __attribute__((packed)) bars[BARS]; ... };	2024-05-31 22:24:57 +00:00
Bartek Kryza	d385b87691	Merge pull request #276 from bkryza/fix-enums-in-context-filter Fix enums in context filter	2024-05-31 19:46:21 +02:00
Bartek Kryza	8a1c551f14	Updated test cases documentation	2024-05-31 19:19:25 +02:00
Bartek Kryza	1283364ef4	Fixed handling of enums in class diagram context filter (#275 )	2024-05-31 19:09:28 +02:00
Bartek Kryza	9ad5336d83	Added documentation about clang-uml-wrapped script for Nix	2024-05-30 21:22:59 +02:00
Bartek Kryza	a9e99c9787	Merge pull request #273 from pogobanane/master Nix package: add wrapper to fix stdlib includes	2024-05-30 21:14:39 +02:00
Pogobanane	d82c2e4acf	nix package: adjust wrapper for clang-uml	2024-05-28 14:22:42 +00:00
Pogobanane	57a681a626	nix package: add wrapper from nixpkgs#clang-tools	2024-05-28 12:18:08 +00:00
Bartek Kryza	aa62c4788c	Merge pull request #272 from bkryza/refactor-tests Refactor tests	2024-05-23 00:19:43 +02:00
Bartek Kryza	2eff7a1192	Updated test cases documentation	2024-05-22 22:48:33 +02:00
Bartek Kryza	a7e2f7a496	Fixed MessageChainsOrder test helper function for JSON	2024-05-22 22:14:28 +02:00
Bartek Kryza	5937061674	Fixed MessageChainsOrder test helper function	2024-05-21 23:38:16 +02:00
Bartek Kryza	e215725622	Adjusted test case generator to new test cases (#266 )	2024-05-20 23:18:19 +02:00
Bartek Kryza	fbe416b50e	Fixed formatting	2024-05-20 23:06:56 +02:00
Bartek Kryza	31100af689	Ported remaining tests from Catch to doctest (#266 )	2024-05-20 22:32:10 +02:00
Bartek Kryza	387b46f683	Refactored sequence diagrams test cases (#266 )	2024-05-20 21:56:54 +02:00
Bartek Kryza	4b5cfa7b48	Refactoring sequence diagrams test cases (#266 )	2024-05-20 00:09:30 +02:00
Bartek Kryza	7c1e0420c6	Refactoring sequence diagrams test cases (#266 )	2024-05-16 21:58:45 +02:00
Bartek Kryza	5d69f5063a	Refactored config based test cases (#266 )	2024-05-14 17:51:55 +02:00
Bartek Kryza	6d3d1ae450	Fixed building on LLVM < 14 (#266 )	2024-05-14 17:27:34 +02:00
Bartek Kryza	27eaea5bbe	Refactored class, package and include diagram test cases (#266 )	2024-05-14 11:39:42 +02:00
Bartek Kryza	eeae5caef5	WIP	2024-05-13 15:51:45 +02:00
Bartek Kryza	235533d9fa	WIP	2024-05-12 00:45:45 +02:00
Bartek Kryza	baeda78c7e	Added doctest to thirdparty deps	2024-05-12 00:45:11 +02:00
Bartek Kryza	ee3ae341d3	Merge pull request #269 from bkryza/v0.5.2 V0.5.2	2024-05-05 12:30:51 +02:00
Bartek Kryza	cd6dce2b0b	Fixed building on Fedora 40	2024-05-05 00:15:35 +02:00
Bartek Kryza	9f370ac8bd	Added Ubuntu Noble Numbat config	2024-05-04 19:24:00 +02:00
Bartek Kryza	67da49df64	Updated test cases documentation	2024-05-04 19:11:29 +02:00
Bartek Kryza	7fcd0dc0dd	Updated packaging instructions	2024-05-04 19:08:05 +02:00
Bartek Kryza	8905f05bad	Updated version to 0.5.2	2024-05-04 17:27:57 +02:00
Bartek Kryza	f1677193ba	Fixed generation of empty packages in class diagrams (Fixes #253 )	2024-05-03 22:19:05 +02:00
Bartek Kryza	bf119aff74	Merge pull request #268 from bkryza/add-option-to-inline-lambdas Add option to inline lambdas	2024-05-03 18:00:51 +02:00
Bartek Kryza	3495ce0039	Updated test cases documentation	2024-05-03 17:26:07 +02:00
Bartek Kryza	f05267997b	Added test case for inlining nested lambda expressions (#261 )	2024-05-03 17:22:33 +02:00
Bartek Kryza	ba4835b6bc	Fixed clang-tidy warnings	2024-05-03 16:48:53 +02:00
Bartek Kryza	95d83345a5	Refactored sequence lambda inlining to diagram model (#261 )	2024-05-03 15:12:05 +02:00
Bartek Kryza	fc25a9bd0e	Updated CHANGELOG	2024-05-03 14:47:05 +02:00
Bartek Kryza	14a13b45aa	Added option inline_lambda_messages to omit lambda expressions from sequence diagrams (#261 )	2024-05-03 14:42:34 +02:00
Bartek Kryza	052d9b7ff3	Merge pull request #267 from bkryza/sequence-diagram-improvements Sequence diagram improvements	2024-05-01 22:25:16 +02:00
Bartek Kryza	1a3d1c19cf	Fixed cmake CUDA target defines	2024-05-01 21:27:33 +02:00
Bartek Kryza	35b66beeca	Updated test cases documentation	2024-05-01 19:39:50 +02:00
Bartek Kryza	b574a41a64	Added test case for cuda_kernel and cuda_device callee types in callee_type filter (#263 )	2024-05-01 19:01:25 +02:00
Bartek Kryza	67363013fe	Added support for CUDA calls in sequence diagrams (#263 )	2024-05-01 18:18:41 +02:00
Bartek Kryza	dfb4f38ded	Fixed generation of internal clang-uml diagrams	2024-04-30 11:51:47 +02:00
Bartek Kryza	51c5b887a8	Added lambda operator() arguments to messages in sequence diagrams	2024-04-30 10:53:33 +02:00
Bartek Kryza	4293a6cc79	Improved handling of message call comments (#264 )	2024-04-30 00:06:42 +02:00
Bartek Kryza	6c6575bc7f	Added test case for call directive in sequence diagrams	2024-04-29 13:17:17 +02:00
Bartek Kryza	efc34bcec6	Fixed handling of nested lambda expressions in sequence diagrams	2024-04-28 01:14:01 +02:00
Bartek Kryza	0539fb0101	Fixed type aliases handling in sequence diagram message names (#260 )	2024-04-27 10:43:15 +02:00
Bartek Kryza	9c07dbfde3	Added support for call expressions tracking through lambdas in function arguments (#168 )	2024-04-26 19:26:32 +02:00
Bartek Kryza	88f315127c	Merge pull request #262 from bkryza/fix-codecov Reverted codecov to v3	2024-04-17 22:27:20 +02:00
Bartek Kryza	57d24da0df	Reverted codecov to v3	2024-04-17 21:09:08 +02:00
Bartek Kryza	7317761670	Updated checkout GitHub action version	2024-04-17 19:57:12 +02:00
Bartek Kryza	87a1e876cc	Updated codecov GitHub action version	2024-04-17 18:36:21 +02:00
Bartek Kryza	449729d54e	Merge pull request #258 from hatch01/master enable building with nix	2024-04-17 18:04:56 +02:00
eymeric	a61d719a69	doc: update build instruction for nix	2024-04-17 18:02:08 +02:00
eymeric	42c9fa4579	update build command to work without flake Co-authored-by: uku <hi@uku.moe>	2024-04-17 09:52:38 +02:00
hatch01	0da2585c3f	fix nix run link Co-authored-by: Thomas Lepoix <thomas.lepoix@protonmail.ch>	2024-04-10 09:50:58 +02:00
eymeric	8e24a2cb63	cleanup nix Co-authored-by: uku <hi@uku.moe>	2024-04-09 18:21:40 +02:00
eymeric	e3fd1382e9	enable building with nix	2024-04-08 22:47:59 +02:00
Bartek Kryza	31d8f4d773	Fixed MSVC build with LLVM 18	2024-03-12 23:10:22 +01:00
Bartek Kryza	0fac87c27a	Merge pull request #252 from bkryza/fix-building-with-llvm18 Fixed building with LLVM 18 (#251)	2024-03-08 00:01:18 +01:00
Bartek Kryza	06ada3af55	Fixed building with LLVM 18 (#251 )	2024-03-07 23:10:46 +01:00
Bartek Kryza	97b094f77e	Merge pull request #250 from bkryza/v0.5.1 V0.5.1	2024-03-06 22:21:30 +01:00