diff --git a/config/ePO-default/config-parameters.xsl b/config/ePO-default/config-parameters.xsl
index 86bbd524..354490f4 100644
--- a/config/ePO-default/config-parameters.xsl
+++ b/config/ePO-default/config-parameters.xsl
@@ -103,5 +103,6 @@
     <xsl:variable name="title-restriction-module">eProcurement extended ontology</xsl:variable>
     <xsl:variable name="description-restriction-module">This module provides the inference-related definitions for
         the eProcurement ontology.</xsl:variable>
+    <xsl:variable name="reference-to-external-classes-in-glossary" select="fn:false()"/>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/common/utils.xsl b/src/common/utils.xsl
index 11bfd83d..e5ca5783 100644
--- a/src/common/utils.xsl
+++ b/src/common/utils.xsl
@@ -220,7 +220,8 @@
                     xs:anyURI(fn:concat(fn:namespace-uri-from-QName($qname), fn:local-name-from-QName($qname)))
                 else
                     xs:anyURI(fn:concat(fn:namespace-uri-from-QName($qname), $defaultDelimiter, fn:local-name-from-QName($qname)))
-                "/>
+                "
+        />
     </xsl:function>
 
     <xd:doc>
@@ -269,7 +270,7 @@
                     $localName
                 "/>
         <xsl:sequence
-            select="f:buildURIFromNode($attribute, fn:concat($prefix,':',$expandedLocalName), $isPascalCase, $isDefaultNamespaceContextualised)"
+            select="f:buildURIFromNode($attribute, fn:concat($prefix, ':', $expandedLocalName), $isPascalCase, $isDefaultNamespaceContextualised)"
         />
     </xsl:function>
 
@@ -301,7 +302,8 @@
                 else
                     concat($defaultNamespacePrefix, ':', $elementName)"/>
 
-        <xsl:sequence select="f:buildURIfromLexicalQName($normalisedElementName, $isPascalCase, fn:true())"/>
+        <xsl:sequence
+            select="f:buildURIfromLexicalQName($normalisedElementName, $isPascalCase, fn:true())"/>
     </xsl:function>
 
 
@@ -435,7 +437,7 @@
                     $attributeMultiplicityValue"
         />
     </xsl:function>
-    
+
     <xd:doc>
         <xd:desc>Check if connector target and source are in the model</xd:desc>
         <xd:param name="connector"/>
@@ -454,4 +456,65 @@
         />
     </xsl:function>
 
+    <xd:doc>
+        <xd:desc>Check if the connector is used to or from external classes</xd:desc>
+        <xd:param name="connectorName"/>
+    </xd:doc>
+
+    <xsl:function name="f:connector-to-or-from-external-class">
+        <xsl:param name="connectorName"/>
+        <xsl:param name="root"/>
+        <xsl:variable name="connectorElements" select="f:getConnectorByName($connectorName, $root)"/>
+        <xsl:choose>
+            <xsl:when test="fn:count($connectorElements) > 1">
+                <xsl:variable name="targetClasses"
+                    select="
+                        for $connector in $connectorElements
+                        return
+                        if (f:getElementByIdRef($connector/target/@xmi:idref, $root)/@name) then
+                                fn:true()
+                            else
+                                fn:false()"/>
+                <xsl:variable name="sourceClasses"
+                    select="
+                        for $connector in $connectorElements
+                        return
+                        if (f:getElementByIdRef($connector/source/@xmi:idref, $root)/@name) then
+                                fn:true()
+                            else
+                                fn:false()"/>
+                <xsl:variable name="externalTargetClasses"
+                    select="
+                        every $i in $targetClasses
+                            satisfies $i = fn:false()"/>
+                <xsl:variable name="externalSourceClasses"
+                    select="
+                        every $i in $sourceClasses
+                            satisfies $i = fn:false()"/>
+                <xsl:sequence
+                    select="
+                    if ($externalSourceClasses or $externalTargetClasses) then
+                            fn:true()
+                        else
+                            fn:false()"/>
+
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:variable name="targetClass"
+                    select="f:getElementByIdRef($connectorElements/target/@xmi:idref, $root)/@name"/>
+                <xsl:variable name="sourceClass"
+                    select="f:getElementByIdRef($connectorElements/source/@xmi:idref, $root)/@name"/>
+                <xsl:sequence
+                    select="
+                        if ($targetClass and $sourceClass) then
+                            fn:false()
+                        else
+                            fn:true()"
+                />
+            </xsl:otherwise>
+        </xsl:choose>
+
+
+    </xsl:function>
+
 </xsl:stylesheet>
diff --git a/src/html-model-glossary.xsl b/src/html-model-glossary.xsl
new file mode 100644
index 00000000..3db53bfa
--- /dev/null
+++ b/src/html-model-glossary.xsl
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+    xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:fn="http://www.w3.org/2005/xpath-functions"
+    exclude-result-prefixes="xs math xd xsl uml xmi umldi dc fn"
+    xmlns:uml="http://www.omg.org/spec/UML/20131001"
+    xmlns:xmi="http://www.omg.org/spec/XMI/20131001"
+    xmlns:umldi="http://www.omg.org/spec/UML/20131001/UMLDI"
+    xmlns:dc="http://www.omg.org/spec/UML/20131001/UMLDC" xmlns:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dct="http://purl.org/dc/terms/"
+    xmlns:skos="http://www.w3.org/2004/02/skos/core#" version="3.0">
+    <xsl:output method="html" indent="yes"/>
+    
+    
+    
+    <xsl:import href="html-model-glossary/fragments/header.xsl"/>
+    <xsl:import href="html-model-glossary/fragments/footer.xsl"/>
+    <xsl:import href="html-model-glossary/glossary.xsl"/>
+    
+    
+    <xsl:template match="/">
+        
+        <html lang="en">
+            <xsl:call-template name="head"/>
+            <xsl:choose>
+                <xsl:when
+                    test="fn:namespace-uri(//*:Model) = 'http://www.omg.org/spec/UML/20131001' and
+                    fn:namespace-uri(//*:XMI) = 'http://www.omg.org/spec/XMI/20131001'">
+                    <body>
+                        <main class="container-fluid">
+                            <div id="toc" class="tocify">
+                                <div class="text-center">
+                                    <p>
+                                        <strong>Table of contents</strong>
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="container">
+                            <xsl:call-template name="glossary"/>
+                            </div>
+                        </main>
+                        <xsl:call-template name="footer"/>
+                    </body>
+                </xsl:when>
+                <xsl:otherwise>
+                    <div class="alert alert-danger text-center">
+                        <i class="fa fa-times-circle error" style="font-size: 60px;"/>
+                        <h1 class="counter-skip">Wrong model version detected. </h1>
+                        <br/>
+                        <p>Please make sure that the XMI file uses XMI version 2.5.1 and UML version 2.5.1.</p> 
+                        <p>The namespaces to check:</p>
+                        <ul>
+                            <li>xmi="http://www.omg.org/spec/XMI/20131001"</li>
+                            <li>uml="http://www.omg.org/spec/UML/20131001"</li>
+                        </ul>
+                    </div>
+                </xsl:otherwise>
+            </xsl:choose>
+        </html>
+    </xsl:template>
+</xsl:stylesheet>
+
+
diff --git a/src/html-model-glossary/fragments/footer.xsl b/src/html-model-glossary/fragments/footer.xsl
new file mode 100644
index 00000000..bb6c75dc
--- /dev/null
+++ b/src/html-model-glossary/fragments/footer.xsl
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+    xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
+    exclude-result-prefixes="xs math xd"
+    version="3.0">
+    <xd:doc scope="stylesheet">
+        <xd:desc>
+            <xd:p><xd:b>Created on:</xd:b> May 17, 2020</xd:p>
+            <xd:p><xd:b>Author:</xd:b> Dragos</xd:p>
+            <xd:p></xd:p>
+        </xd:desc>
+    </xd:doc>
+    
+    
+    <xsl:template name="footer">
+        <footer class="text-center">
+            <br/><br/>
+            <p> This document is generated automatically by the <a
+                    href="https://github.com/costezki/model2owl" target="_blank">model2owl tool</a>
+                developed in the context of <a
+                    href="https://joinup.ec.europa.eu/solution/eprocurement-ontology">the
+                    eProcurement Ontology initiative</a>.</p>
+            <p>The template of this report is based on the <a
+                    href="https://github.com/thomaspark/pubcss">PubCSS library</a>.</p>
+            <p>&#169; Publications Office of the European Union, 2022</p>
+        </footer>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
+        
+        <script src="static/js/jquery-3.4.1.min.js"></script>
+        <script src="static/js/jquery-ui.min.js"></script>
+        <script src="static/js/bootstrap.min.js"></script>
+        <script src="static/js/jquery.tocify.min.js"></script>
+        <script type="text/javascript" src="https://cdn.datatables.net/1.10.22/js/jquery.dataTables.min.js"></script>
+        <script type="text/javascript" src="https://cdn.datatables.net/buttons/1.6.4/js/dataTables.buttons.min.js"></script>
+        <script type="text/javascript" src="https://cdn.datatables.net/buttons/1.6.4/js/buttons.print.min.js"></script>
+        
+        <script>
+            $(function () {
+            //Calls the tocify method on your HTML div.
+            $("#toc").tocify({
+            selectors: "h2",
+            theme: "bootstrap",
+            hashGenerator: "pretty",
+            ignoreSelector: ".skip-toc"
+            });
+            });
+            
+        </script>
+        <script>
+            $(document).ready(function () {
+            
+            $("table.display").DataTable({
+            buttons: [],
+            "lengthMenu": [[-1], ["All"]],
+            responsive: {
+            details: true
+            }
+            });
+            
+            });
+        </script>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/html-model-glossary/fragments/header.xsl b/src/html-model-glossary/fragments/header.xsl
new file mode 100644
index 00000000..ff6ff12b
--- /dev/null
+++ b/src/html-model-glossary/fragments/header.xsl
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+    xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
+    exclude-result-prefixes="xs math xd"
+    version="3.0">
+    <xd:doc scope="stylesheet">
+        <xd:desc>
+            <xd:p><xd:b>Created on:</xd:b> May 17, 2022</xd:p>
+            <xd:p><xd:b>Author:</xd:b> Dragos</xd:p>
+            <xd:p></xd:p>
+        </xd:desc>
+    </xd:doc>
+    
+    <xsl:template name="head">
+        <head>            
+            <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+            <meta charset="utf-8"/>
+            <meta name="description" content="Model glossary"/>
+            <meta name="author" content="Publications Office of the European Union"/>
+            <meta name="viewport" content="width=device-width, initial-scale=1"/>
+            
+            <link rel="stylesheet" href="static/css/jquery-ui.min.css"/>  
+            <link rel="stylesheet" href="static/css/bootstrap.min.css"/>
+            <link rel="stylesheet" href="static/css/pubcss-acm-sig.css"/>
+<!--            <link rel="stylesheet" media="screen" href="static/css/screen.css"/>
+            <link rel="stylesheet" media="print" href="static/css/print.css"/>-->
+            <link rel="stylesheet" href="static/css/toc_adjustments.css"/>
+            <link href="https://cdn.datatables.net/1.10.22/css/jquery.dataTables.min.css" rel="stylesheet"/>
+            
+            <link rel="shortcut icon" href=""/>
+            <style>
+                #toc {
+                font-size: 1.2em;
+                width: 10%;
+                }
+                @media print{@page {size: landscape}}
+                
+            </style>
+            <title>Model glossary</title>
+        </head>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/src/html-model-glossary/glossary.xsl b/src/html-model-glossary/glossary.xsl
new file mode 100644
index 00000000..eebd6dcd
--- /dev/null
+++ b/src/html-model-glossary/glossary.xsl
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
+    xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:fn="http://www.w3.org/2005/xpath-functions"
+    exclude-result-prefixes="xs math xd xsl uml xmi umldi dc fn"
+    xmlns:uml="http://www.omg.org/spec/UML/20131001"
+    xmlns:xmi="http://www.omg.org/spec/XMI/20131001"
+    xmlns:umldi="http://www.omg.org/spec/UML/20131001/UMLDI"
+    xmlns:dc="http://www.omg.org/spec/UML/20131001/UMLDC" xmlns:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dct="http://purl.org/dc/terms/"
+    xmlns:skos="http://www.w3.org/2004/02/skos/core#"
+    xmlns:f="http://https://github.com/costezki/model2owl#" version="3.0">
+
+
+    <xsl:import href="../common/utils.xsl"/>
+    <xsl:import href="../common/formatters.xsl"/>
+    <xsl:import href="../common/fetchers.xsl"/>
+
+
+    <xsl:template name="glossary">
+        <h1>Glossary</h1>
+        <h2>Class names and definitions</h2>
+        <table class="display">
+            <thead class="center aligned">
+                <tr>
+                    <th>Class name</th>
+                    <th>Description</th>
+                </tr>
+            </thead>
+            <tbody>
+                <xsl:call-template name="listOfClassNamesAndDescription"/>
+            </tbody>
+        </table>
+
+        <h2>DataType properties and definitions</h2>
+        <table class="display">
+            <thead class="center aligned">
+                <tr>
+                    <th>Attribute name</th>
+                    <th>Description</th>
+                    <th>Domain class name</th>
+                    <th>Range data type</th>
+                </tr>
+            </thead>
+            <tbody>
+                <xsl:call-template name="listOfClassAttributeNames"/>
+            </tbody>
+        </table>
+
+        <h2>Object properties and definitions</h2>
+        <table class="display">
+            <thead class="center aligned">
+                <tr>
+                    <th>Connector name</th>
+                    <th>Description</th>
+                    <th>Domain and Range classes</th>
+                </tr>
+            </thead>
+            <tbody>
+                <xsl:call-template name="listOfConnectors"/>
+            </tbody>
+        </table>
+    </xsl:template>
+
+
+    <xsl:template name="listOfClassNamesAndDescription">
+        <xsl:variable name="root" select="root()"/>
+        <xsl:variable name="classNames" select="f:getDistinctClassNames($root)"/>
+        <xsl:for-each select="$classNames">
+            <xsl:sort select="." lang="en"/>
+            <tr>
+                <td>
+                    <xsl:value-of select="."/>
+                </td>
+                <td>
+                    <xsl:variable name="classElement" select="f:getElementByName(., $root)"/>
+                    <xsl:value-of select="f:formatDocString($classElement/properties/@documentation)"/>
+                </td>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+
+
+
+
+    <xsl:template name="listOfClassAttributeNames">
+        <xsl:variable name="root" select="root()"/>
+        <xsl:variable name="attributeNames" select="f:getDistinctClassAttributeNames($root)"/>
+        <xsl:for-each select="$attributeNames">
+            <xsl:sort select="." lang="en"/>
+            <xsl:variable name="attributeName" select="."/>
+            <tr>
+                <td>
+
+                    <xsl:value-of select="$attributeName"/>
+                </td>
+
+                <xsl:call-template name="classAttributeUsage">
+                    <xsl:with-param name="attributeName" select="$attributeName"/>
+                    <xsl:with-param name="root" select="$root"/>
+                </xsl:call-template>
+            </tr>
+        </xsl:for-each>
+    </xsl:template>
+
+
+    <xsl:template name="classAttributeUsage">
+        <xsl:param name="attributeName"/>
+        <xsl:param name="root"/>
+        <xsl:variable name="attributesWithSameName"
+            select="f:getClassAttributeByName($attributeName, $root)"/>
+        <xsl:choose>
+            <xsl:when test="fn:count($attributesWithSameName) > 1">
+                <td>
+
+                    <xsl:value-of
+                        select="
+                            for $atribute in $attributesWithSameName
+                            return
+                            f:formatDocString($atribute/documentation/@value)"
+                    />
+                </td>
+                <td>
+                    <xsl:for-each select="$attributesWithSameName">
+                        <xsl:value-of select="./parent::attributes/parent::element/@name"/>
+                        <br/>
+                    </xsl:for-each>
+                </td>
+                <td>
+                    <xsl:for-each select="$attributesWithSameName">
+                        <xsl:variable name="attributeType" select="./properties/@type"/>
+                        <xsl:variable name="attributeMultiplicityMin" select="./bounds/@lower"/>
+                        <xsl:variable name="attributeMultiplicityMax" select="./bounds/@upper"/>
+                        <xsl:value-of
+                            select="fn:concat($attributeType, ' [', $attributeMultiplicityMin, '..', $attributeMultiplicityMax, ']')"/>
+                        <br/>
+                    </xsl:for-each>
+                </td>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:variable name="className"
+                    select="$attributesWithSameName/parent::attributes/parent::element/@name"/>
+                <td>
+                    <xsl:value-of select="f:formatDocString($attributesWithSameName/documentation/@value)"/>
+                </td>
+                <td>
+                    <xsl:value-of select="$className"/>
+                </td>
+                <xsl:variable name="attributeType" select="$attributesWithSameName/properties/@type"/>
+                <xsl:variable name="attributeMultiplicityMin"
+                    select="$attributesWithSameName/bounds/@lower"/>
+                <xsl:variable name="attributeMultiplicityMax"
+                    select="$attributesWithSameName/bounds/@upper"/>
+                <td>
+                    <xsl:value-of
+                        select="fn:concat($attributeType, ' [', $attributeMultiplicityMin, '..', $attributeMultiplicityMax, ']')"
+                    />
+                </td>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+  
+    <xsl:template name="listOfConnectors">
+        <xsl:variable name="root" select="root()"/>
+        <xsl:variable name="connectorNames" select="f:getDistinctConnectorsNames($root)"/>
+        <xsl:for-each select="$connectorNames">
+            <xsl:sort select="." lang="en"/>
+            <xsl:if test="not(f:connector-to-or-from-external-class(., $root)) or $reference-to-external-classes-in-glossary">
+            <xsl:variable name="connectorName" select="."/>
+            <tr>
+                <td>
+                    <xsl:value-of select="$connectorName"/>
+                    <xsl:value-of select="f:connector-to-or-from-external-class(.,$root)"/>
+                </td>
+
+                <xsl:call-template name="connectorUsage">
+                    <xsl:with-param name="connectorName" select="$connectorName"/>
+                    <xsl:with-param name="root" select="$root"/>
+                </xsl:call-template>
+            </tr>
+            </xsl:if>
+        </xsl:for-each>
+    </xsl:template>
+
+    <xsl:template name="connectorUsage">
+        <xsl:param name="connectorName"/>
+        <xsl:param name="root"/>
+        <xsl:variable name="connectorsWithSameName"
+            select="f:getConnectorByName($connectorName, $root)"/>
+        <xsl:choose>
+            <xsl:when test="fn:count($connectorsWithSameName) > 1">
+                <td>
+                    <xsl:value-of
+                        select="
+                            for $connector in $connectorsWithSameName
+                            return
+                            f:formatDocString(fn:concat($connector/documentation/@value, $connector/source/documentation/@value, $connector/target/documentation/@value))"
+                    />
+                </td>
+                <td>
+                    <xsl:for-each select="$connectorsWithSameName">
+                        <xsl:variable name="targetClass"
+                            select="
+                                if (f:getElementByIdRef(./target/@xmi:idref, $root)/@name) then
+                                    f:getElementByIdRef(./target/@xmi:idref, $root)/@name
+                                else
+                                    if ($reference-to-external-classes-in-glossary) then
+                                        fn:concat(./target/model/@name, ' (external)')
+                                    else
+                                        ()"/>
+                        <xsl:variable name="sourceClass"
+                            select="
+                                if (f:getElementByIdRef(./source/@xmi:idref, $root)/@name) then
+                                    f:getElementByIdRef(./source/@xmi:idref, $root)/@name
+                                else
+                                    if ($reference-to-external-classes-in-glossary) then
+                                        fn:concat(./source/model/@name, ' (external)')
+                                    else
+                                        ()"/>
+                        <xsl:variable name="targetMultiplicity" select="./target/type/@multiplicity"/>
+                        <xsl:variable name="sourceMultiplicity" select="./source/type/@multiplicity"/>
+                        <xsl:if test="./target/role/@name = $connectorName">
+
+                            <xsl:value-of
+                                select="
+                                    if ($sourceClass and $targetClass) then
+                                        fn:concat($sourceClass, ' -&gt; ', $targetClass, ' [', $targetMultiplicity, ']')
+                                    else
+                                        ()"
+                            />
+                            <br/>
+                        </xsl:if>
+                        <xsl:if test="./source/role/@name = $connectorName">
+
+                            <xsl:value-of
+                                select="
+                                    if ($sourceClass and $targetClass) then
+                                        fn:concat($sourceClass, ' [,', $sourceMultiplicity, ']', ' &lt;- ', $targetClass)
+                                    else
+                                        ()"
+                            />
+                            <br/>
+                        </xsl:if>
+                    </xsl:for-each>
+                </td>
+            </xsl:when>
+            <xsl:otherwise>
+                <td>
+                    <xsl:value-of
+                        select="f:formatDocString(fn:concat($connectorsWithSameName/documentation/@value, $connectorsWithSameName/source/documentation/@value, $connectorsWithSameName/target/documentation/@value))"
+                    />
+                </td>
+
+                <xsl:variable name="targetClass"
+                    select="
+                        if (f:getElementByIdRef($connectorsWithSameName/target/@xmi:idref, $root)/@name) then
+                            f:getElementByIdRef($connectorsWithSameName/target/@xmi:idref, $root)/@name
+                        else
+                            if ($reference-to-external-classes-in-glossary) then
+                                fn:concat($connectorsWithSameName/target/model/@name, ' (external)')
+                            else
+                                ()"/>
+                <xsl:variable name="sourceClass"
+                    select="
+                        if (f:getElementByIdRef($connectorsWithSameName/source/@xmi:idref, $root)/@name) then
+                            f:getElementByIdRef($connectorsWithSameName/source/@xmi:idref, $root)/@name
+                        else
+                            if ($reference-to-external-classes-in-glossary) then
+                                fn:concat($connectorsWithSameName/source/model/@name, ' (external)')
+                            else
+                                ()"/>
+                <xsl:variable name="targetMultiplicity"
+                    select="$connectorsWithSameName/target/type/@multiplicity"/>
+                <xsl:variable name="sourceMultiplicity"
+                    select="$connectorsWithSameName/source/type/@multiplicity"/>
+                <xsl:if test="$connectorsWithSameName/target/role/@name = $connectorName">
+                    <td>
+                        <xsl:value-of
+                            select="fn:concat($sourceClass, ' -&gt; ', $targetClass, ' [', $targetMultiplicity, ']')"
+                        />
+                    </td>
+                </xsl:if>
+                <xsl:if test="$connectorsWithSameName/source/role/@name = $connectorName">
+                    <td>
+                        <xsl:value-of
+                            select="
+                                if ($sourceClass and $targetClass) then
+                                    fn:concat($sourceClass, ' [,', $sourceMultiplicity, ']', ' &lt;- ', $targetClass)
+                                else
+                                    ()"
+                        />
+                    </td>
+                </xsl:if>
+            </xsl:otherwise>
+        </xsl:choose>
+
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file