From 641ade8519457aaa24052656caf33d75d5a46d74 Mon Sep 17 00:00:00 2001
From: Farshid Tavakolizadeh <email@farshid.ws>
Date: Wed, 26 May 2021 14:35:14 +0200
Subject: [PATCH] Improvements to diagrams and text

---
 images/discovery-class-diagram-ontology.puml | 17 +++----
 images/discovery-class-diagram-ontology.svg  | 33 ++++++-------
 images/exploration-class-diagram.puml        |  9 ++--
 images/exploration-class-diagram.svg         | 36 +++++++-------
 index.html                                   | 52 +++++++++++---------
 5 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/images/discovery-class-diagram-ontology.puml b/images/discovery-class-diagram-ontology.puml
index 95c73ebf..64e087ef 100644
--- a/images/discovery-class-diagram-ontology.puml
+++ b/images/discovery-class-diagram-ontology.puml
@@ -1,22 +1,21 @@
 @startuml
 hide members
+skinparam classBackgroundColor Azure
+
 class Thing as "td:Thing"
+note left: Thing Description (TD)
 class ThingDirectory as "discovery:ThingDirectory"
 class ThingLink as "discovery:ThingLink"
 
 class RegInfo as "discovery:RegistrationInformation" #Azure {
-  discovery:created : xsd:datetime
-  discovery:modified : xsd:datetime
-  discovery:expires : xsd:datetime
-  discovery:ttl : xsd:integer
-  discovery:retrieved : xsd:datetime
+  discovery:created : xsd:dateTime
+  discovery:modified : xsd:dateTime
+  discovery:expires : xsd:dateTime
+  discovery:ttl : xsd:unsignedInt
+  discovery:retrieved : xsd:dateTime
 }
 show RegInfo attributes
 
-note left of Thing
-  Thing Description (TD)
-end note
-
 Thing <|-- ThingDirectory
 Thing <|-- ThingLink
 Thing --> RegInfo : "discovery:hasRegistrationInformation"
diff --git a/images/discovery-class-diagram-ontology.svg b/images/discovery-class-diagram-ontology.svg
index 6862db20..1dd89327 100644
--- a/images/discovery-class-diagram-ontology.svg
+++ b/images/discovery-class-diagram-ontology.svg
@@ -1,30 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="257px" preserveAspectRatio="none" style="width:742px;height:257px;" version="1.1" viewBox="0 0 742 257" width="742px" zoomAndPan="magnify"><defs><filter height="300%" id="fmufin4ramdgt" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--MD5=[1053da7555f32ea3c982e01119b403ff]
-class Thing--><rect codeLine="2" fill="#FEFECE" filter="url(#fmufin4ramdgt)" height="32" id="Thing" style="stroke:#A80036;stroke-width:1.5;" width="80" x="249" y="18"/><ellipse cx="264" cy="34" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M266.4731,40.1431 Q265.8921,40.4419 265.2529,40.5913 Q264.6138,40.7407 263.9082,40.7407 Q261.4014,40.7407 260.0815,39.0889 Q258.7617,37.437 258.7617,34.3159 Q258.7617,31.1865 260.0815,29.5347 Q261.4014,27.8828 263.9082,27.8828 Q264.6138,27.8828 265.2612,28.0322 Q265.9087,28.1816 266.4731,28.4805 L266.4731,31.2031 Q265.8423,30.6221 265.2488,30.3523 Q264.6553,30.0825 264.0244,30.0825 Q262.6797,30.0825 261.9949,31.1492 Q261.3101,32.2158 261.3101,34.3159 Q261.3101,36.4077 261.9949,37.4744 Q262.6797,38.541 264.0244,38.541 Q264.6553,38.541 265.2488,38.2712 Q265.8423,38.0015 266.4731,37.4204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="48" x="278" y="38.5352">td:Thing</text><!--MD5=[5f26c86091fa2c90ec21445571d1772b]
-class ThingDirectory--><rect codeLine="3" fill="#FEFECE" filter="url(#fmufin4ramdgt)" height="32" id="ThingDirectory" style="stroke:#A80036;stroke-width:1.5;" width="174" x="7" y="175.5"/><ellipse cx="22" cy="191.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M24.4731,197.6431 Q23.8921,197.9419 23.2529,198.0913 Q22.6138,198.2407 21.9082,198.2407 Q19.4014,198.2407 18.0815,196.5889 Q16.7617,194.937 16.7617,191.8159 Q16.7617,188.6865 18.0815,187.0347 Q19.4014,185.3828 21.9082,185.3828 Q22.6138,185.3828 23.2612,185.5322 Q23.9087,185.6816 24.4731,185.9805 L24.4731,188.7031 Q23.8423,188.1221 23.2488,187.8523 Q22.6553,187.5825 22.0244,187.5825 Q20.6797,187.5825 19.9949,188.6492 Q19.3101,189.7158 19.3101,191.8159 Q19.3101,193.9077 19.9949,194.9744 Q20.6797,196.041 22.0244,196.041 Q22.6553,196.041 23.2488,195.7712 Q23.8423,195.5015 24.4731,194.9204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="142" x="36" y="196.0352">discovery:ThingDirectory</text><!--MD5=[02e2853ccf748be19475c5f2583b6311]
-class ThingLink--><rect codeLine="4" fill="#FEFECE" filter="url(#fmufin4ramdgt)" height="32" id="ThingLink" style="stroke:#A80036;stroke-width:1.5;" width="145" x="216.5" y="175.5"/><ellipse cx="231.5" cy="191.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M233.9731,197.6431 Q233.3921,197.9419 232.7529,198.0913 Q232.1138,198.2407 231.4082,198.2407 Q228.9014,198.2407 227.5815,196.5889 Q226.2617,194.937 226.2617,191.8159 Q226.2617,188.6865 227.5815,187.0347 Q228.9014,185.3828 231.4082,185.3828 Q232.1138,185.3828 232.7612,185.5322 Q233.4087,185.6816 233.9731,185.9805 L233.9731,188.7031 Q233.3423,188.1221 232.7488,187.8523 Q232.1553,187.5825 231.5244,187.5825 Q230.1797,187.5825 229.4949,188.6492 Q228.8101,189.7158 228.8101,191.8159 Q228.8101,193.9077 229.4949,194.9744 Q230.1797,196.041 231.5244,196.041 Q232.1553,196.041 232.7488,195.7712 Q233.3423,195.5015 233.9731,194.9204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="113" x="245.5" y="196.0352">discovery:ThingLink</text><!--MD5=[378b90cc04bfe2ab5b7bdbd324672d28]
-class RegInfo--><rect codeLine="6" fill="#F0FFFF" filter="url(#fmufin4ramdgt)" height="104.7754" id="RegInfo" style="stroke:#A80036;stroke-width:1.5;" width="223" x="396.5" y="139"/><ellipse cx="411.5" cy="155" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M413.9731,161.1431 Q413.3921,161.4419 412.7529,161.5913 Q412.1138,161.7407 411.4082,161.7407 Q408.9014,161.7407 407.5815,160.0889 Q406.2617,158.437 406.2617,155.3159 Q406.2617,152.1865 407.5815,150.5347 Q408.9014,148.8828 411.4082,148.8828 Q412.1138,148.8828 412.7612,149.0322 Q413.4087,149.1816 413.9731,149.4805 L413.9731,152.2031 Q413.3423,151.6221 412.7488,151.3523 Q412.1553,151.0825 411.5244,151.0825 Q410.1797,151.0825 409.4949,152.1492 Q408.8101,153.2158 408.8101,155.3159 Q408.8101,157.4077 409.4949,158.4744 Q410.1797,159.541 411.5244,159.541 Q412.1553,159.541 412.7488,159.2712 Q413.3423,159.0015 413.9731,158.4204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="191" x="425.5" y="159.5352">discovery:RegistrationInformation</text><line style="stroke:#A80036;stroke-width:1.5;" x1="397.5" x2="618.5" y1="171" y2="171"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="173" x="402.5" y="185.6348">discovery:created : xsd:datetime</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="180" x="402.5" y="198.5898">discovery:modified : xsd:datetime</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="173" x="402.5" y="211.5449">discovery:expires : xsd:datetime</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="136" x="402.5" y="224.5">discovery:ttl : xsd:integer</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="181" x="402.5" y="237.4551">discovery:retrieved : xsd:datetime</text><path d="M50,21.5 L50,46.8105 A0,0 0 0 0 50,46.8105 L214,46.8105 A0,0 0 0 0 214,46.8105 L214,39.5 L248.9594,34 L214,31.5 L214,31.5 L204,21.5 L50,21.5 A0,0 0 0 0 50,21.5 " fill="#FBFB77" filter="url(#fmufin4ramdgt)" style="stroke:#A80036;stroke-width:1.0;"/><path d="M204,21.5 L204,31.5 L214,31.5 L204,21.5 " fill="#FBFB77" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="143" x="56" y="39.0684">Thing Description (TD)</text><path d="M364.5,6 L364.5,61.9316 L733.5,61.9316 L733.5,16 L723.5,6 L364.5,6 " fill="#FBFB77" filter="url(#fmufin4ramdgt)" style="stroke:#A80036;stroke-width:1.0;"/><path d="M723.5,6 L723.5,16 L733.5,16 L723.5,6 " fill="#FBFB77" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="370.5" y="23.5684">Prefixes:</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="246" x="378.5" y="38.8789">td: https://www.w3.org/2019/wot/td#</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="340" x="378.5" y="54.1895">discovery: https://www.w3.org/2021/wot/discovery#</text><!--MD5=[d5f59610cc0cc723c8bbc515566a052f]
-reverse link Thing to ThingDirectory--><path codeLine="19" d="M253.2633,62.8643 C212.3606,95.901 146.8057,148.8492 114.0244,175.3264 " fill="none" id="Thing-backto-ThingDirectory" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="248.9088,57.3832,268.866,50.262,257.7056,68.2744,248.9088,57.3832" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b583c48d99aa5b3cf0e91b6eadef3db4]
-reverse link Thing to ThingLink--><path codeLine="20" d="M289,70.3933 C289,103.3787 289,150.4785 289,175.0905 " fill="none" id="Thing-backto-ThingLink" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="282.0001,70.2621,289,50.262,296.0001,70.262,282.0001,70.2621" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[89fe35fb0672e043d63e3ff0bff4df4b]
-link Thing to RegInfo--><path codeLine="21" d="M311.612,50.262 C339.5054,70.3224 388.3926,105.481 430.4109,135.6996 " fill="none" id="Thing-to-RegInfo" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="434.7146,138.7947,429.7435,130.2924,430.6554,135.8753,425.0725,136.7872,434.7146,138.7947" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="236" x="393" y="105.5684">discovery:hasRegistrationInformation</text><!--MD5=[adbb164c1bc873254b803e4d2e766894]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="257px" preserveAspectRatio="none" style="width:742px;height:257px;" version="1.1" viewBox="0 0 742 257" width="742px" zoomAndPan="magnify"><defs><filter height="300%" id="f1b3hyskwnk41a" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--MD5=[1053da7555f32ea3c982e01119b403ff]
+class Thing--><rect codeLine="4" fill="#F0FFFF" filter="url(#f1b3hyskwnk41a)" height="32" id="Thing" style="stroke:#A80036;stroke-width:1.5;" width="80" x="249" y="18"/><ellipse cx="264" cy="34" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M266.4731,40.1431 Q265.8921,40.4419 265.2529,40.5913 Q264.6138,40.7407 263.9082,40.7407 Q261.4014,40.7407 260.0815,39.0889 Q258.7617,37.437 258.7617,34.3159 Q258.7617,31.1865 260.0815,29.5347 Q261.4014,27.8828 263.9082,27.8828 Q264.6138,27.8828 265.2612,28.0322 Q265.9087,28.1816 266.4731,28.4805 L266.4731,31.2031 Q265.8423,30.6221 265.2488,30.3523 Q264.6553,30.0825 264.0244,30.0825 Q262.6797,30.0825 261.9949,31.1492 Q261.3101,32.2158 261.3101,34.3159 Q261.3101,36.4077 261.9949,37.4744 Q262.6797,38.541 264.0244,38.541 Q264.6553,38.541 265.2488,38.2712 Q265.8423,38.0015 266.4731,37.4204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="48" x="278" y="38.5352">td:Thing</text><path d="M50,21.5 L50,46.8105 A0,0 0 0 0 50,46.8105 L214,46.8105 A0,0 0 0 0 214,46.8105 L214,39.5 L248.9594,34 L214,31.5 L214,31.5 L204,21.5 L50,21.5 A0,0 0 0 0 50,21.5 " fill="#FBFB77" filter="url(#f1b3hyskwnk41a)" style="stroke:#A80036;stroke-width:1.0;"/><path d="M204,21.5 L204,31.5 L214,31.5 L204,21.5 " fill="#FBFB77" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="143" x="56" y="39.0684">Thing Description (TD)</text><!--MD5=[5f26c86091fa2c90ec21445571d1772b]
+class ThingDirectory--><rect codeLine="6" fill="#F0FFFF" filter="url(#f1b3hyskwnk41a)" height="32" id="ThingDirectory" style="stroke:#A80036;stroke-width:1.5;" width="174" x="7" y="175.5"/><ellipse cx="22" cy="191.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M24.4731,197.6431 Q23.8921,197.9419 23.2529,198.0913 Q22.6138,198.2407 21.9082,198.2407 Q19.4014,198.2407 18.0815,196.5889 Q16.7617,194.937 16.7617,191.8159 Q16.7617,188.6865 18.0815,187.0347 Q19.4014,185.3828 21.9082,185.3828 Q22.6138,185.3828 23.2612,185.5322 Q23.9087,185.6816 24.4731,185.9805 L24.4731,188.7031 Q23.8423,188.1221 23.2488,187.8523 Q22.6553,187.5825 22.0244,187.5825 Q20.6797,187.5825 19.9949,188.6492 Q19.3101,189.7158 19.3101,191.8159 Q19.3101,193.9077 19.9949,194.9744 Q20.6797,196.041 22.0244,196.041 Q22.6553,196.041 23.2488,195.7712 Q23.8423,195.5015 24.4731,194.9204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="142" x="36" y="196.0352">discovery:ThingDirectory</text><!--MD5=[02e2853ccf748be19475c5f2583b6311]
+class ThingLink--><rect codeLine="7" fill="#F0FFFF" filter="url(#f1b3hyskwnk41a)" height="32" id="ThingLink" style="stroke:#A80036;stroke-width:1.5;" width="145" x="216.5" y="175.5"/><ellipse cx="231.5" cy="191.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M233.9731,197.6431 Q233.3921,197.9419 232.7529,198.0913 Q232.1138,198.2407 231.4082,198.2407 Q228.9014,198.2407 227.5815,196.5889 Q226.2617,194.937 226.2617,191.8159 Q226.2617,188.6865 227.5815,187.0347 Q228.9014,185.3828 231.4082,185.3828 Q232.1138,185.3828 232.7612,185.5322 Q233.4087,185.6816 233.9731,185.9805 L233.9731,188.7031 Q233.3423,188.1221 232.7488,187.8523 Q232.1553,187.5825 231.5244,187.5825 Q230.1797,187.5825 229.4949,188.6492 Q228.8101,189.7158 228.8101,191.8159 Q228.8101,193.9077 229.4949,194.9744 Q230.1797,196.041 231.5244,196.041 Q232.1553,196.041 232.7488,195.7712 Q233.3423,195.5015 233.9731,194.9204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="113" x="245.5" y="196.0352">discovery:ThingLink</text><!--MD5=[378b90cc04bfe2ab5b7bdbd324672d28]
+class RegInfo--><rect codeLine="9" fill="#F0FFFF" filter="url(#f1b3hyskwnk41a)" height="104.7754" id="RegInfo" style="stroke:#A80036;stroke-width:1.5;" width="223" x="396.5" y="139"/><ellipse cx="411.5" cy="155" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M413.9731,161.1431 Q413.3921,161.4419 412.7529,161.5913 Q412.1138,161.7407 411.4082,161.7407 Q408.9014,161.7407 407.5815,160.0889 Q406.2617,158.437 406.2617,155.3159 Q406.2617,152.1865 407.5815,150.5347 Q408.9014,148.8828 411.4082,148.8828 Q412.1138,148.8828 412.7612,149.0322 Q413.4087,149.1816 413.9731,149.4805 L413.9731,152.2031 Q413.3423,151.6221 412.7488,151.3523 Q412.1553,151.0825 411.5244,151.0825 Q410.1797,151.0825 409.4949,152.1492 Q408.8101,153.2158 408.8101,155.3159 Q408.8101,157.4077 409.4949,158.4744 Q410.1797,159.541 411.5244,159.541 Q412.1553,159.541 412.7488,159.2712 Q413.3423,159.0015 413.9731,158.4204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="191" x="425.5" y="159.5352">discovery:RegistrationInformation</text><line style="stroke:#A80036;stroke-width:1.5;" x1="397.5" x2="618.5" y1="171" y2="171"/><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="176" x="402.5" y="185.6348">discovery:created : xsd:dateTime</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="183" x="402.5" y="198.5898">discovery:modified : xsd:dateTime</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="176" x="402.5" y="211.5449">discovery:expires : xsd:dateTime</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="162" x="402.5" y="224.5">discovery:ttl : xsd:unsignedInt</text><text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacing" textLength="184" x="402.5" y="237.4551">discovery:retrieved : xsd:dateTime</text><path d="M364.5,6 L364.5,61.9316 L733.5,61.9316 L733.5,16 L723.5,6 L364.5,6 " fill="#FBFB77" filter="url(#f1b3hyskwnk41a)" style="stroke:#A80036;stroke-width:1.0;"/><path d="M723.5,6 L723.5,16 L733.5,16 L723.5,6 " fill="#FBFB77" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="370.5" y="23.5684">Prefixes:</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="246" x="378.5" y="38.8789">td: https://www.w3.org/2019/wot/td#</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="340" x="378.5" y="54.1895">discovery: https://www.w3.org/2021/wot/discovery#</text><!--MD5=[d5f59610cc0cc723c8bbc515566a052f]
+reverse link Thing to ThingDirectory--><path codeLine="18" d="M253.2633,62.8643 C212.3606,95.901 146.8057,148.8492 114.0244,175.3264 " fill="none" id="Thing-backto-ThingDirectory" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="248.9088,57.3832,268.866,50.262,257.7056,68.2744,248.9088,57.3832" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[b583c48d99aa5b3cf0e91b6eadef3db4]
+reverse link Thing to ThingLink--><path codeLine="19" d="M289,70.3933 C289,103.3787 289,150.4785 289,175.0905 " fill="none" id="Thing-backto-ThingLink" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="282.0001,70.2621,289,50.262,296.0001,70.262,282.0001,70.2621" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[89fe35fb0672e043d63e3ff0bff4df4b]
+link Thing to RegInfo--><path codeLine="20" d="M311.612,50.262 C339.5054,70.3224 388.3926,105.481 430.4109,135.6996 " fill="none" id="Thing-to-RegInfo" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="434.7146,138.7947,429.7435,130.2924,430.6554,135.8753,425.0725,136.7872,434.7146,138.7947" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="236" x="393" y="105.5684">discovery:hasRegistrationInformation</text><!--MD5=[b1e6c3b1feca185fdda9a8a2404de0d5]
 @startuml
 hide members
+skinparam classBackgroundColor Azure
+
 class Thing as "td:Thing"
+note left: Thing Description (TD)
 class ThingDirectory as "discovery:ThingDirectory"
 class ThingLink as "discovery:ThingLink"
 
 class RegInfo as "discovery:RegistrationInformation" #Azure {
-  discovery:created : xsd:datetime
-  discovery:modified : xsd:datetime
-  discovery:expires : xsd:datetime
-  discovery:ttl : xsd:integer
-  discovery:retrieved : xsd:datetime
+  discovery:created : xsd:dateTime
+  discovery:modified : xsd:dateTime
+  discovery:expires : xsd:dateTime
+  discovery:ttl : xsd:unsignedInt
+  discovery:retrieved : xsd:dateTime
 }
 show RegInfo attributes
 
-note left of Thing
-  Thing Description (TD)
-end note
-
 Thing <|- - ThingDirectory
 Thing <|- - ThingLink
 Thing - -> RegInfo : "discovery:hasRegistrationInformation"
diff --git a/images/exploration-class-diagram.puml b/images/exploration-class-diagram.puml
index 93de5980..8c44d15c 100644
--- a/images/exploration-class-diagram.puml
+++ b/images/exploration-class-diagram.puml
@@ -3,13 +3,14 @@
 hide methods
 hide members
 
-class Thing <<service>>
+class Thing <<(S,#eb937f) service>>
 together {
-    class SelfDesc as "Self-describing Thing" <<service>>
-    class Directory <<service>>
+    class SelfDesc as "Self-describing Thing" <<(S,#eb937f) service>>
+    class Directory <<(S,#eb937f) service>>
 }
 
-class TD as "Thing Description"
+class TD as "td:Thing" #Azure
+note left: Thing Description (TD)
 
 /' relations '/
 Thing <|-- SelfDesc
diff --git a/images/exploration-class-diagram.svg b/images/exploration-class-diagram.svg
index c2fe641f..9b43d70a 100644
--- a/images/exploration-class-diagram.svg
+++ b/images/exploration-class-diagram.svg
@@ -1,24 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="267px" preserveAspectRatio="none" style="width:295px;height:267px;" version="1.1" viewBox="0 0 295 267" width="295px" zoomAndPan="magnify"><defs><filter height="300%" id="fiun76my7sdcu" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--MD5=[0c8f81674d0e9026104f104b6fbe6eff]
-class SelfDesc--><rect codeLine="7" fill="#FEFECE" filter="url(#fiun76my7sdcu)" height="38.2656" id="SelfDesc" style="stroke:#A80036;stroke-width:1.5;" width="155" x="7" y="106"/><ellipse cx="22" cy="125.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M24.4731,131.2759 Q23.8921,131.5747 23.2529,131.7241 Q22.6138,131.8735 21.9082,131.8735 Q19.4014,131.8735 18.0815,130.2217 Q16.7617,128.5698 16.7617,125.4487 Q16.7617,122.3193 18.0815,120.6675 Q19.4014,119.0156 21.9082,119.0156 Q22.6138,119.0156 23.2612,119.165 Q23.9087,119.3145 24.4731,119.6133 L24.4731,122.3359 Q23.8423,121.7549 23.2488,121.4851 Q22.6553,121.2153 22.0244,121.2153 Q20.6797,121.2153 19.9949,122.282 Q19.3101,123.3486 19.3101,125.4487 Q19.3101,127.5405 19.9949,128.6072 Q20.6797,129.6738 22.0244,129.6738 Q22.6553,129.6738 23.2488,129.4041 Q23.8423,129.1343 24.4731,128.5532 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="71.5" y="122.6016">«service»</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="123" x="36" y="136.7344">Self-describing Thing</text><!--MD5=[9bd2b2bc45261200a440e1ecb7c43192]
-class Directory--><rect codeLine="8" fill="#FEFECE" filter="url(#fiun76my7sdcu)" height="38.2656" id="Directory" style="stroke:#A80036;stroke-width:1.5;" width="84" x="197.5" y="106"/><ellipse cx="212.5" cy="125.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M214.9731,131.2759 Q214.3921,131.5747 213.7529,131.7241 Q213.1138,131.8735 212.4082,131.8735 Q209.9014,131.8735 208.5815,130.2217 Q207.2617,128.5698 207.2617,125.4487 Q207.2617,122.3193 208.5815,120.6675 Q209.9014,119.0156 212.4082,119.0156 Q213.1138,119.0156 213.7612,119.165 Q214.4087,119.3145 214.9731,119.6133 L214.9731,122.3359 Q214.3423,121.7549 213.7488,121.4851 Q213.1553,121.2153 212.5244,121.2153 Q211.1797,121.2153 210.4949,122.282 Q209.8101,123.3486 209.8101,125.4487 Q209.8101,127.5405 210.4949,128.6072 Q211.1797,129.6738 212.5244,129.6738 Q213.1553,129.6738 213.7488,129.4041 Q214.3423,129.1343 214.9731,128.5532 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="226.5" y="122.6016">«service»</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="52" x="226.5" y="136.7344">Directory</text><!--MD5=[1053da7555f32ea3c982e01119b403ff]
-class Thing--><rect codeLine="5" fill="#FEFECE" filter="url(#fiun76my7sdcu)" height="38.2656" id="Thing" style="stroke:#A80036;stroke-width:1.5;" width="80" x="121.5" y="7"/><ellipse cx="136.5" cy="26.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M138.9731,32.2759 Q138.3921,32.5747 137.7529,32.7241 Q137.1138,32.8735 136.4082,32.8735 Q133.9014,32.8735 132.5815,31.2217 Q131.2617,29.5698 131.2617,26.4487 Q131.2617,23.3193 132.5815,21.6675 Q133.9014,20.0156 136.4082,20.0156 Q137.1138,20.0156 137.7612,20.165 Q138.4087,20.3145 138.9731,20.6133 L138.9731,23.3359 Q138.3423,22.7549 137.7488,22.4851 Q137.1553,22.2153 136.5244,22.2153 Q135.1797,22.2153 134.4949,23.282 Q133.8101,24.3486 133.8101,26.4487 Q133.8101,28.5405 134.4949,29.6072 Q135.1797,30.6738 136.5244,30.6738 Q137.1553,30.6738 137.7488,30.4041 Q138.3423,30.1343 138.9731,29.5532 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="148.5" y="23.6016">«service»</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="32" x="158.5" y="37.7344">Thing</text><!--MD5=[f66eb5cd0a27e450a5267fbcb4094f6d]
-class TD--><rect codeLine="11" fill="#FEFECE" filter="url(#fiun76my7sdcu)" height="32" id="TD" style="stroke:#A80036;stroke-width:1.5;" width="133" x="95" y="221"/><ellipse cx="110" cy="237" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M112.4731,243.1431 Q111.8921,243.4419 111.2529,243.5913 Q110.6138,243.7407 109.9082,243.7407 Q107.4014,243.7407 106.0815,242.0889 Q104.7617,240.437 104.7617,237.3159 Q104.7617,234.1865 106.0815,232.5347 Q107.4014,230.8828 109.9082,230.8828 Q110.6138,230.8828 111.2612,231.0322 Q111.9087,231.1816 112.4731,231.4805 L112.4731,234.2031 Q111.8423,233.6221 111.2488,233.3523 Q110.6553,233.0825 110.0244,233.0825 Q108.6797,233.0825 107.9949,234.1492 Q107.3101,235.2158 107.3101,237.3159 Q107.3101,239.4077 107.9949,240.4744 Q108.6797,241.541 110.0244,241.541 Q110.6553,241.541 111.2488,241.2712 Q111.8423,241.0015 112.4731,240.4204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="101" x="124" y="241.5352">Thing Description</text><!--MD5=[88221bcd57db51459cd4199f69591b42]
-reverse link Thing to SelfDesc--><path codeLine="14" d="M134.2837,60.9924 C122.5122,76.1272 109.197,93.2468 99.3008,105.9704 " fill="none" id="Thing-backto-SelfDesc" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="128.8493,56.5777,146.6536,45.0882,139.9002,65.1729,128.8493,56.5777" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6811a1fa3166692e42720dcd61a45561]
-reverse link Thing to Directory--><path codeLine="15" d="M189.0698,60.9924 C200.9941,76.1272 214.4823,93.2468 224.507,105.9704 " fill="none" id="Thing-backto-Directory" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="183.4182,65.1302,176.5392,45.0882,194.4151,56.4659,183.4182,65.1302" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[962830750a9a6ad5a90804d94990eddc]
-link SelfDesc to TD--><path codeLine="16" d="M95.6335,144.1259 C103.5949,157.4941 114.7593,175.6311 125.5,191 C131.4798,199.5565 138.4712,208.6693 144.694,216.5076 " fill="none" id="SelfDesc-to-TD" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="148.0606,220.7195,145.5657,211.1919,144.9387,216.8139,139.3167,216.1869,148.0606,220.7195" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="126.5" y="187.5684">provides</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="89.8181" y="164.8553">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="124.6908" y="210.1667">1</text><!--MD5=[22095c50f58adeae0dd4a30b6d5b7e14]
-link Directory to TD--><path codeLine="17" d="M226.0913,144.2535 C212.0213,164.4566 189.995,196.0842 175.6521,216.679 " fill="none" id="Directory-to-TD" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="172.7138,220.8982,181.1398,215.7989,175.5714,216.7952,174.575,211.2268,172.7138,220.8982" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="205.5" y="187.5684">contains</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="199.215" y="164.6873">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="194.765" y="210.1137">0..*</text><!--MD5=[8f2b48eb8cb2bf4749dfcfe3496c49b1]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="267px" preserveAspectRatio="none" style="width:372px;height:267px;" version="1.1" viewBox="0 0 372 267" width="372px" zoomAndPan="magnify"><defs><filter height="300%" id="fmxq68j4rnt4g" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--MD5=[0c8f81674d0e9026104f104b6fbe6eff]
+class SelfDesc--><rect codeLine="7" fill="#FEFECE" filter="url(#fmxq68j4rnt4g)" height="38.2656" id="SelfDesc" style="stroke:#A80036;stroke-width:1.5;" width="155" x="83.5" y="106"/><ellipse cx="98.5" cy="125.1328" fill="#EB937F" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M97.7334,126.1958 Q95.8823,125.4902 95.2266,124.7141 Q94.5708,123.938 94.5708,122.6265 Q94.5708,120.9414 95.6499,119.9785 Q96.729,119.0156 98.6133,119.0156 Q99.4683,119.0156 100.3232,119.2107 Q101.1782,119.4058 102.0166,119.7876 L102.0166,122.1782 Q101.228,121.6221 100.4146,121.3315 Q99.6011,121.041 98.8042,121.041 Q97.916,121.041 97.4429,121.3979 Q96.9697,121.7549 96.9697,122.4189 Q96.9697,122.9336 97.3142,123.2698 Q97.6587,123.606 98.7544,124.0127 L99.8086,124.4111 Q101.3027,124.959 102.0083,125.8638 Q102.7139,126.7686 102.7139,128.1465 Q102.7139,130.0225 101.6057,130.948 Q100.4976,131.8735 98.2563,131.8735 Q97.335,131.8735 96.4094,131.6536 Q95.4839,131.4336 94.6206,131.002 L94.6206,128.4702 Q95.6001,129.1675 96.5173,129.5078 Q97.4346,129.8481 98.3311,129.8481 Q99.2358,129.8481 99.7339,129.4373 Q100.2319,129.0264 100.2319,128.2876 Q100.2319,127.7314 99.8999,127.3123 Q99.5679,126.8931 98.937,126.6523 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="148" y="122.6016">«service»</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="123" x="112.5" y="136.7344">Self-describing Thing</text><!--MD5=[9bd2b2bc45261200a440e1ecb7c43192]
+class Directory--><rect codeLine="8" fill="#FEFECE" filter="url(#fmxq68j4rnt4g)" height="38.2656" id="Directory" style="stroke:#A80036;stroke-width:1.5;" width="84" x="274" y="106"/><ellipse cx="289" cy="125.1328" fill="#EB937F" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M288.2334,126.1958 Q286.3823,125.4902 285.7266,124.7141 Q285.0708,123.938 285.0708,122.6265 Q285.0708,120.9414 286.1499,119.9785 Q287.229,119.0156 289.1133,119.0156 Q289.9683,119.0156 290.8232,119.2107 Q291.6782,119.4058 292.5166,119.7876 L292.5166,122.1782 Q291.728,121.6221 290.9146,121.3315 Q290.1011,121.041 289.3042,121.041 Q288.416,121.041 287.9429,121.3979 Q287.4697,121.7549 287.4697,122.4189 Q287.4697,122.9336 287.8142,123.2698 Q288.1587,123.606 289.2544,124.0127 L290.3086,124.4111 Q291.8027,124.959 292.5083,125.8638 Q293.2139,126.7686 293.2139,128.1465 Q293.2139,130.0225 292.1057,130.948 Q290.9976,131.8735 288.7563,131.8735 Q287.835,131.8735 286.9094,131.6536 Q285.9839,131.4336 285.1206,131.002 L285.1206,128.4702 Q286.1001,129.1675 287.0173,129.5078 Q287.9346,129.8481 288.8311,129.8481 Q289.7358,129.8481 290.2339,129.4373 Q290.7319,129.0264 290.7319,128.2876 Q290.7319,127.7314 290.3999,127.3123 Q290.0679,126.8931 289.437,126.6523 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="303" y="122.6016">«service»</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="52" x="303" y="136.7344">Directory</text><!--MD5=[1053da7555f32ea3c982e01119b403ff]
+class Thing--><rect codeLine="5" fill="#FEFECE" filter="url(#fmxq68j4rnt4g)" height="38.2656" id="Thing" style="stroke:#A80036;stroke-width:1.5;" width="80" x="198" y="7"/><ellipse cx="213" cy="26.1328" fill="#EB937F" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M212.2334,27.1958 Q210.3823,26.4902 209.7266,25.7141 Q209.0708,24.938 209.0708,23.6265 Q209.0708,21.9414 210.1499,20.9785 Q211.229,20.0156 213.1133,20.0156 Q213.9683,20.0156 214.8232,20.2107 Q215.6782,20.4058 216.5166,20.7876 L216.5166,23.1782 Q215.728,22.6221 214.9146,22.3315 Q214.1011,22.041 213.3042,22.041 Q212.416,22.041 211.9429,22.3979 Q211.4697,22.7549 211.4697,23.4189 Q211.4697,23.9336 211.8142,24.2698 Q212.1587,24.606 213.2544,25.0127 L214.3086,25.4111 Q215.8027,25.959 216.5083,26.8638 Q217.2139,27.7686 217.2139,29.1465 Q217.2139,31.0225 216.1057,31.948 Q214.9976,32.8735 212.7563,32.8735 Q211.835,32.8735 210.9094,32.6536 Q209.9839,32.4336 209.1206,32.002 L209.1206,29.4702 Q210.1001,30.1675 211.0173,30.5078 Q211.9346,30.8481 212.8311,30.8481 Q213.7358,30.8481 214.2339,30.4373 Q214.7319,30.0264 214.7319,29.2876 Q214.7319,28.7314 214.3999,28.3123 Q214.0679,27.8931 213.437,27.6523 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="52" x="225" y="23.6016">«service»</text><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="32" x="235" y="37.7344">Thing</text><!--MD5=[f66eb5cd0a27e450a5267fbcb4094f6d]
+class TD--><rect codeLine="11" fill="#F0FFFF" filter="url(#fmxq68j4rnt4g)" height="32" id="TD" style="stroke:#A80036;stroke-width:1.5;" width="80" x="205" y="221"/><ellipse cx="220" cy="237" fill="#ADD1B2" rx="11" ry="11" style="stroke:#A80036;stroke-width:1.0;"/><path d="M222.4731,243.1431 Q221.8921,243.4419 221.2529,243.5913 Q220.6138,243.7407 219.9082,243.7407 Q217.4014,243.7407 216.0815,242.0889 Q214.7617,240.437 214.7617,237.3159 Q214.7617,234.1865 216.0815,232.5347 Q217.4014,230.8828 219.9082,230.8828 Q220.6138,230.8828 221.2612,231.0322 Q221.9087,231.1816 222.4731,231.4805 L222.4731,234.2031 Q221.8423,233.6221 221.2488,233.3523 Q220.6553,233.0825 220.0244,233.0825 Q218.6797,233.0825 217.9949,234.1492 Q217.3101,235.2158 217.3101,237.3159 Q217.3101,239.4077 217.9949,240.4744 Q218.6797,241.541 220.0244,241.541 Q220.6553,241.541 221.2488,241.2712 Q221.8423,241.0015 222.4731,240.4204 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacing" textLength="48" x="234" y="241.5352">td:Thing</text><path d="M6,224.5 L6,249.8105 A0,0 0 0 0 6,249.8105 L170,249.8105 A0,0 0 0 0 170,249.8105 L170,242.5 L204.9594,237 L170,234.5 L170,234.5 L160,224.5 L6,224.5 A0,0 0 0 0 6,224.5 " fill="#FBFB77" filter="url(#fmxq68j4rnt4g)" style="stroke:#A80036;stroke-width:1.0;"/><path d="M160,224.5 L160,234.5 L170,234.5 L160,224.5 " fill="#FBFB77" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="143" x="12" y="242.0684">Thing Description (TD)</text><!--MD5=[88221bcd57db51459cd4199f69591b42]
+reverse link Thing to SelfDesc--><path codeLine="15" d="M210.7837,60.9924 C199.0122,76.1272 185.697,93.2468 175.8008,105.9704 " fill="none" id="Thing-backto-SelfDesc" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="205.3493,56.5777,223.1536,45.0882,216.4002,65.1729,205.3493,56.5777" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[6811a1fa3166692e42720dcd61a45561]
+reverse link Thing to Directory--><path codeLine="16" d="M265.5698,60.9924 C277.4941,76.1272 290.9823,93.2468 301.007,105.9704 " fill="none" id="Thing-backto-Directory" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="none" points="259.9182,65.1302,253.0392,45.0882,270.9151,56.4659,259.9182,65.1302" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[962830750a9a6ad5a90804d94990eddc]
+link SelfDesc to TD--><path codeLine="17" d="M175.4401,144.2535 C190.5925,164.4566 214.3131,196.0842 229.7593,216.679 " fill="none" id="SelfDesc-to-TD" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="232.9236,220.8982,230.7236,211.2982,229.9236,216.8982,224.3236,216.0982,232.9236,220.8982" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="209" y="187.5684">provides</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="170.5069" y="164.6873">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="209.7714" y="210.1137">1</text><!--MD5=[22095c50f58adeae0dd4a30b6d5b7e14]
+link Directory to TD--><path codeLine="18" d="M303.7947,144.2535 C291.0409,164.3721 271.1054,195.8197 258.0463,216.4199 " fill="none" id="Directory-to-TD" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="255.2074,220.8982,263.4046,215.4387,257.8846,216.6753,256.648,211.1553,255.2074,220.8982" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="285" y="187.5684">contains</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="277.2719" y="164.6873">1</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="22" x="276.9" y="210.1137">0..*</text><!--MD5=[f4f3bb0e5d7af19bc65e1de21803eef7]
 @startuml exploration-class-diagram
 /' global configurations '/
 hide methods
 hide members
 
-class Thing <<service>>
+class Thing <<(S,#eb937f) service>>
 together {
-    class SelfDesc as "Self-describing Thing" <<service>>
-    class Directory <<service>>
+    class SelfDesc as "Self-describing Thing" <<(S,#eb937f) service>>
+    class Directory <<(S,#eb937f) service>>
 }
 
-class TD as "Thing Description"
+class TD as "td:Thing" #Azure
+note left: Thing Description (TD)
 
 /' relations '/
 Thing <|- - SelfDesc
@@ -33,13 +34,14 @@ Directory "1   " - -> "   0..*" TD: contains
 hide methods
 hide members
 
-class Thing <<service>>
+class Thing <<(S,#eb937f) service>>
 together {
-    class SelfDesc as "Self-describing Thing" <<service>>
-    class Directory <<service>>
+    class SelfDesc as "Self-describing Thing" <<(S,#eb937f) service>>
+    class Directory <<(S,#eb937f) service>>
 }
 
-class TD as "Thing Description"
+class TD as "td:Thing" #Azure
+note left: Thing Description (TD)
 
 Thing <|- - SelfDesc
 Thing <|- - Directory
diff --git a/index.html b/index.html
index f66faa78..b2c52c6b 100644
--- a/index.html
+++ b/index.html
@@ -483,7 +483,10 @@ <h1>Exploration Mechanisms</h1>
             <img src="images/exploration-class-diagram.svg"
                 class="wot-diagram"
                 alt="Exploration mechanisms high-level class diagram" />
-            <figcaption>The high-level class diagram of the exploration mechanisms</figcaption>
+            <figcaption>
+                The high-level class diagram of the exploration mechanisms,
+                depicting how Things expose <a>TD</a>s.
+            </figcaption>
         </figure>
 
         [[[#exploration-class-diagram]]] depicts the high-level information 
@@ -497,17 +500,23 @@ <h1>Exploration Mechanisms</h1>
             <img src="images/discovery-class-diagram-ontology.svg"
                 class="wot-diagram"
                 alt="Ontology of TD in discovery context" />
-            <figcaption>The ontology of Thing Descriptions in the discovery context</figcaption>
+            <figcaption>The ontology of Thing Descriptions in the discovery context.</figcaption>
         </figure>
 
         <p>
             [[[#discovery-class-diagram-ontology]]] illustrates the ontology of 
-            <a>TD</a>s in the discovery context.
+            <a>TD</a>s in the Discovery context.
+        </p>
+        <p>
+            The ontology includes a class for metadata that are associated with
+            TDs stored in a directory.
+            This class is called `RegistrationInformation` and described as part
+            of the directory specification in [[[#exploration-directory-registration-info]]].
         </p>
 
         <p>
-	    The Discovery ontology defines two new Thing Description classes that may be
-        used to model special exploratory metadata:
+	        Moreover, the Discovery ontology defines two new Thing Description classes
+            that may be used to model special exploratory metadata:
         </p>
 
         <div class="issue" data-number="148">
@@ -522,24 +531,24 @@ <h1>Exploration Mechanisms</h1>
             </span>
             <p>
                 [[[#directory-thing-description]]] which describes the API of the
-                Thing Description Directory is an example of this TD type.
+                Thing Description Directory is an example of this TD class.
             </p>
         </dd>
         
-        <dt>ThingLink</dt>
+        <dt>Thing Link</dt>
         <dd>
             <span class="rfc2119-assertion" id="exploration-link-description-type"> 
                 A TD which describes a reference to another TD MUST use type `ThingLink` from the
                 discovery context or URI `https://www.w3.org/2021/wot/discovery#ThingLink`.
             </span>
             <span class="rfc2119-assertion" id="exploration-link-description-link"> 
-                The ThingLink MUST define the referenced TD as a Link with
+                A Thing Link MUST define the referenced TD as a Link with
                 `describedby` link relation type, `application/td+json` media type
                 and `href` set to the target URL.
             </span>
 
             <p>
-                [[[#example-td-link-type]]] is an example ThingLink.
+                [[[#example-td-link-type]]] is an example Thing Link.
             </p>
 
             <!-- Using https://tools.ietf.org/html/rfc6963 for ID of examples -->
@@ -547,7 +556,7 @@ <h1>Exploration Mechanisms</h1>
                 <pre>
                     {
                         "@context": [
-                            "http://www.w3.org/ns/td,
+                            "http://www.w3.org/ns/td",
                             "https://w3c.github.io/wot-discovery/context/discovery-context.jsonld"
                         ],
                         "@type": "ThingLink",
@@ -572,15 +581,6 @@ <h1>Exploration Mechanisms</h1>
             </aside>
         </dd>
         
-        
-        <p>
-            Directories can store zero or more <a>TD</a>s.
-            For every TD, the directory additionally maintains the registration
-            information for bookkeeping and search purposes;
-            see [[[#discovery-class-diagram-ontology]]].
-            The information model of the directory is described in [[[#exploration-directory-info]]].
-        </p>
-        
         <section id="exploration-self" class="normative">
             <h2>Self-description</h2>
             <!-- <p class="ednote" title="Self-Description Overview">
@@ -664,11 +664,17 @@ <h3>Information Model</h3>
 
                 <section id="exploration-directory-registration-info" class="normative">
                     <h4>Registration Information</h4>
-                    The following table lists the registration information attributes. In this
-                    context, client is the producer or consumer of a <a>TD</a> and server is
+                    The ontology of a <a>TD</a> in the Discovery context was
+                    introduced in [[[#discovery-class-diagram-ontology]]].
+                    The `RegistrationInformation` class is associated with <a>TD</a>s that are
+                    stored in a directory. 
+                    The following table lists the registration information attributes for
+                    use within <a>TD</a>s that embed or reference the Discovery context. 
+                    Note that only an <a>Enriched TD</a> embeds the registration information.
+                    In this table,
+                    client refers to the producer or consumer of a <a>TD</a> and server refers to
                     the <a>Thing Description Directory</a>.
-                    Only an <a>Enriched TD</a> embeds the registration information.
-                    <table class="def">
+                    <table id="test" class="def">
                         <thead>
                             <tr>
                                 <th>Vocabulary term</th>