diff --git a/tools/gradletooling/sample/mkdocs_template.yml b/tools/gradletooling/sample/mkdocs_template.yml
index 8cbc88d..13170f7 100644
--- a/tools/gradletooling/sample/mkdocs_template.yml
+++ b/tools/gradletooling/sample/mkdocs_template.yml
@@ -9,11 +9,15 @@ theme:
 markdown_extensions:
   - tables
   - toc
+  - attr_list
   - pymdownx.superfences:
       custom_fences:
         - name: mermaid
           class: mermaid
           format: !!python/name:pymdownx.superfences.fence_code_format
+  - pymdownx.emoji:
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
 nav:
   - Home: index.md
   - AutoGenerated Documentation:
diff --git a/tools/xslt/vo-dml2md.xsl b/tools/xslt/vo-dml2md.xsl
index 322b0ef..94b861f 100644
--- a/tools/xslt/vo-dml2md.xsl
+++ b/tools/xslt/vo-dml2md.xsl
@@ -394,8 +394,18 @@ classDiagram
     <xsl:template match="attribute|reference|composition">
         <xsl:text> | </xsl:text>
         <xsl:value-of select="name"/>
+        <xsl:if test="constraint[ends-with(@xsi:type,':NaturalKey')]">
+            <xsl:value-of select="concat(' :material-key-variant:{title=',$dq,'natural key',$dq,'}')"/>
+        </xsl:if>
+        <xsl:if test="./ancestor-or-self::reference">
+            <xsl:value-of select="concat(' :material-arrow-top-right:{title=',$dq,'reference',$dq,'}')"/>
+        </xsl:if>
+
         <xsl:text> | </xsl:text>
         <xsl:apply-templates select="datatype/vodml-ref"/>
+        <xsl:if test="semanticconcept">
+             <xsl:value-of select="concat(' from [',semanticconcept/vocabularyURI,'](',semanticconcept/vocabularyURI,'){:target=',$dq,'_blank',$dq,'}')"/>
+        </xsl:if>
         <xsl:text> | </xsl:text>
         <xsl:apply-templates select="multiplicity"/><xsl:if test="@isOrdered"><xsl:text> ordered</xsl:text></xsl:if>
         <xsl:text> | </xsl:text>