diff --git a/SDT/schema4.0/docs/SDT_Components.md b/SDT/schema4.0/docs/SDT_Components.md
index 644aa403d9419057aa2f8277122cf3f67af860c7..62d5079e638627335c129d6fda3f8009d0b69635 100644
--- a/SDT/schema4.0/docs/SDT_Components.md
+++ b/SDT/schema4.0/docs/SDT_Components.md
@@ -176,8 +176,8 @@ The element has the following attributes:
 	- **domain** : Identifier / Reference of the [Domain](#Domain) of the extended *DeviceClass*. Required for this element.
 	- **class** : Name of the *DeviceClass* in the [Domain](#Domain) that is extended. Required for this element.
 The element has the following child elements:
-	- **ImplementModuleClasses** : A list of names of the implemented optional [ModuleClasses](#ModuleClass) in the [DeviceClass](#DeviceClass) that is extended. Optional. If not present, only mandatory [ModuleClasses](#ModuleClass) are implemented. If present, both the listed optional [ModuleClasses](#ModuleClass) and the mandatory [ModuleClass](#ModuleClass) are implemented.
-	- **ImplementProperties** : A list of name-value pairs of the implemented optional device [Properties](#Property) in the [DeviceClass](#DeviceClass) that is extended. Optional. If not present, only mandatory [Properties](#Property) are implemented. If present, both the listed optional [Properties](#Property) and the mandatory [Properties](#Property) are implemented, and the values of those [Properties](#Property) are initiated as provided. In the case that the value of the [Properties](#Property) should not be initiated, the value can be omitted.
+	- **ImplementedModuleClasses** : A list of names of the implemented optional [ModuleClasses](#ModuleClass) in the [DeviceClass](#DeviceClass) that is extended. Optional. If not present, only mandatory [ModuleClasses](#ModuleClass) are implemented. If present, both the listed optional [ModuleClasses](#ModuleClass) and the mandatory [ModuleClass](#ModuleClass) are implemented.
+	- **ImplementedProperties** : A list of name-value pairs of the implemented optional device [Properties](#Property) in the [DeviceClass](#DeviceClass) that is extended. Optional. If not present, only mandatory [Properties](#Property) are implemented. If present, both the listed optional [Properties](#Property) and the mandatory [Properties](#Property) are implemented, and the values of those [Properties](#Property) are initiated as provided. In the case that the value of the [Properties](#Property) should not be initiated, the value can be omitted.
 
 **Note**: New extended *Properties* and *ModuleClasses* **should** have different names from those in the inherited *DeviceClass*. In case the names conflict, the newly defined *Properties* and *ModuleClasses* shall override the inherited ones.
 
@@ -187,15 +187,15 @@ The element has the following child elements:
 ```
 <Product id="myMseebProduct">
 	<Extends domain="org.exampleDomain" class="MSEEB.root">
-		<ImplementPropertyies>
+		<ImplementedPropertyies>
 			<Property name="name" value="product-abc"/>
 			<Property name="vendor" value="xyz"/>
 			<Property name="SerialNumber"/>
-		</ImplementProperties>
-		<ImplementModuleClasses>
+		</ImplementedProperties>
+		<ImplementedModuleClasses>
 			<MoudleClass name="rootPowerOnOff"/>
 			<MoudleClass name="power" />
-		</ImplementModuleClasses>	
+		</ImplementedModuleClasses>	
 	</Extends>
 	<Properties name="someNewProperty" value="someValue">
 		<Doc>...</Doc>
@@ -223,7 +223,7 @@ The element has the following child elements:
 		"Extends": {
 			"domain": "org.exampleDomain",
 			"class": "MSEEB.root",
-			"ImplementProperties": [{
+			"ImplementedProperties": [{
 				"name": "name",
 				"value": "product-abc"
 			},
@@ -234,7 +234,7 @@ The element has the following child elements:
 			{
 				"name": "SerialNumber"
 			}],
-			"ImplementModuleClasses": ["rootPowerOnOff","power"]
+			"ImplementedModuleClasses": ["rootPowerOnOff","power"]
 		},
 		"Properties": [{
 			"name": "someNewProperty",
diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf
index 8b3bbd81f80f57359b4faf427b12edd6100229a5..8630b1998c4478ca63781b57c82e5fa2ed2eceb5 100644
--- a/SDT/schema4.0/docs/SDT_UML.uxf
+++ b/SDT/schema4.0/docs/SDT_UML.uxf
@@ -1,711 +1,760 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<diagram program="umlet" version="13.3">
-  <help_text/>
-  <zoom_level>7</zoom_level>
-  <element>
-    <id>UMLNote</id>
-    <coordinates>
-      <x>21</x>
-      <y>427</y>
-      <w>217</w>
-      <h>182</h>
-    </coordinates>
-    <panel_attributes>bg=#FAF8C8
-fontsize=12
-/@ optional elementAttribute/
-/@ optional elementAttribute = default value/
-*@ mandatoryElementAttribute*
-- mandatory element : Subclass  (exact one)
-/- optionalElement : SubClass      (zero or one)/
-/* optionalElement : SubClass      (zero or many)/
-
-"Depends" Relation
-and Cardinality
-
-Subclassing
-
-Cardinalities:
-0,1  : zero or one
-1     : exact one
-0..* : zero or many
-1..* : at least one or many
-</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>105</x>
-      <y>497</y>
-      <w>77</w>
-      <h>28</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-fontsize=10
-m1=0..*
-</panel_attributes>
-    <additional_attributes>90.0;20.0;10.0;20.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>105</x>
-      <y>525</y>
-      <w>77</w>
-      <h>21</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;-
-fontsize=10</panel_attributes>
-    <additional_attributes>90.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>651</x>
-      <y>770</y>
-      <w>105</w>
-      <h>154</h>
-    </coordinates>
-    <panel_attributes>&lt;&lt;enumeration&gt;&gt;
-BasicType
---
-boolean
-byte
-integer
-float
-string
-enum
-date
-time
-datetime
-blob
-uri</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>357</x>
-      <y>833</y>
-      <w>98</w>
-      <h>56</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;.
-m1= 0,1
-</panel_attributes>
-    <additional_attributes>120.0;50.0;60.0;50.0;60.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>357</x>
-      <y>777</y>
-      <w>98</w>
-      <h>56</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;.
-m1= 0,1
-</panel_attributes>
-    <additional_attributes>120.0;10.0;40.0;10.0;40.0;60.0;10.0;60.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>21</x>
-      <y>777</y>
-      <w>133</w>
-      <h>84</h>
-    </coordinates>
-    <panel_attributes>DataType
---
-/@ name : text/
-/@ unitOfMeasure : text/
-/- Doc : Doc/
-- TypeChoice
-/* Constraints : Constraint/
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>126</x>
-      <y>735</y>
-      <w>490</w>
-      <h>91</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;.
-m2=1..*
-</panel_attributes>
-    <additional_attributes>10.0;60.0;10.0;20.0;680.0;20.0;680.0;100.0;640.0;100.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>126</x>
-      <y>735</y>
-      <w>490</w>
-      <h>133</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;.
-m2=1
-</panel_attributes>
-    <additional_attributes>10.0;60.0;10.0;20.0;680.0;20.0;680.0;160.0;640.0;160.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>441</x>
-      <y>861</y>
-      <w>133</w>
-      <h>35</h>
-    </coordinates>
-    <panel_attributes>SimpleType
---
-*@ type : BasicType*
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>567</x>
-      <y>875</y>
-      <w>98</w>
-      <h>35</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;-
-m1= 1
-</panel_attributes>
-    <additional_attributes>120.0;20.0;10.0;20.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>441</x>
-      <y>917</y>
-      <w>133</w>
-      <h>70</h>
-    </coordinates>
-    <panel_attributes>Constraint
---
-*@ name : text*
-/@ type : BasicType/
-/@ value : text/
-/- Doc : Doc/
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>147</x>
-      <y>847</y>
-      <w>308</w>
-      <h>98</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1=0..*
-</panel_attributes>
-    <additional_attributes>420.0;110.0;340.0;110.0;340.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>567</x>
-      <y>917</y>
-      <w>147</w>
-      <h>56</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;-
-m1=1
-</panel_attributes>
-    <additional_attributes>190.0;10.0;190.0;60.0;10.0;60.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>441</x>
-      <y>777</y>
-      <w>133</w>
-      <h>35</h>
-    </coordinates>
-    <panel_attributes>StructType
---
-- DataType : DataType
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>441</x>
-      <y>819</y>
-      <w>133</w>
-      <h>35</h>
-    </coordinates>
-    <panel_attributes>ArrayType
---
-- DataType : DataType
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>357</x>
-      <y>812</y>
-      <w>98</w>
-      <h>35</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;.
-m1= 0,1
-
-</panel_attributes>
-    <additional_attributes>120.0;20.0;10.0;20.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>21</x>
-      <y>672</y>
-      <w>735</w>
-      <h>28</h>
-    </coordinates>
-    <panel_attributes>halign=center
-SDT 3.0 - DataType
-fontsize=24
-bg=gray
-lw=0.1</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>21</x>
-      <y>7</y>
-      <w>840</w>
-      <h>28</h>
-    </coordinates>
-    <panel_attributes>SDT 3.0 - Basic Elements
-halign=center
-fontsize=24
-bg=gray
-lw=0.1</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>259</x>
-      <y>126</y>
-      <w>154</w>
-      <h>133</h>
-    </coordinates>
-    <panel_attributes>ModuleClass
---
-*@ name : text*
-/@ optional : boolean = false/
-/- Doc : Doc/
-/- extends/
-/   @domain : IDRF/
-/   @class : text /
-/* Properties : Property/
-/* Actions : Action/
-/* Data : DataPoint/
-/* Events : Event/
-fg=blue
-</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>497</x>
-      <y>126</y>
-      <w>154</w>
-      <h>77</h>
-    </coordinates>
-    <panel_attributes>Action
---
-*@ name : text*
-/@ optional : boolean = false/
-/- Doc : Doc/
-/- DataType : DataType/
-/* Args : Arg/
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>742</x>
-      <y>189</y>
-      <w>119</w>
-      <h>56</h>
-    </coordinates>
-    <panel_attributes>Arg
---
-*@ name ; text*
-/- Doc : Doc/
-- DataType : DataType
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>644</x>
-      <y>189</y>
-      <w>112</w>
-      <h>28</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1= 0..*</panel_attributes>
-    <additional_attributes>140.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>21</x>
-      <y>126</y>
-      <w>154</w>
-      <h>77</h>
-    </coordinates>
-    <panel_attributes>Domain
---
-*@ id : ID*
-/- Doc : Doc/
-/* imports/
-/* Modules : ModuleClass/
-/* Devices : Device/
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>168</x>
-      <y>126</y>
-      <w>105</w>
-      <h>63</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1= 0..*</panel_attributes>
-    <additional_attributes>130.0;10.0;50.0;10.0;50.0;70.0;10.0;70.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>21</x>
-      <y>308</y>
-      <w>154</w>
-      <h>70</h>
-    </coordinates>
-    <panel_attributes>SubDevice
---
-*@ id : Name*
-/- Doc : Doc/
-/* Properties : Property/
-/* Modules : Module/
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>168</x>
-      <y>182</y>
-      <w>49</w>
-      <h>63</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1=0..*
-</panel_attributes>
-    <additional_attributes>10.0;60.0;50.0;60.0;50.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>168</x>
-      <y>315</y>
-      <w>105</w>
-      <h>49</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1= 0..*</panel_attributes>
-    <additional_attributes>130.0;10.0;60.0;10.0;60.0;50.0;10.0;50.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>742</x>
-      <y>357</y>
-      <w>119</w>
-      <h>35</h>
-    </coordinates>
-    <panel_attributes>Doc
---
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>406</x>
-      <y>126</y>
-      <w>105</w>
-      <h>42</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1= 0..*
-</panel_attributes>
-    <additional_attributes>130.0;10.0;50.0;10.0;50.0;40.0;10.0;40.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>686</x>
-      <y>350</y>
-      <w>70</w>
-      <h>35</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1=0,1
-</panel_attributes>
-    <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>406</x>
-      <y>161</y>
-      <w>105</w>
-      <h>84</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1= 0..*
-</panel_attributes>
-    <additional_attributes>130.0;90.0;50.0;90.0;50.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>497</x>
-      <y>217</y>
-      <w>154</w>
-      <h>98</h>
-    </coordinates>
-    <panel_attributes>DataPoint
---
-*@ name : text*
-/@ optional : boolean = false/
-/@ writable : boolean = true/
-/@ readable : boolean = true/
-/@ eventable : boolean = false/
-/- Doc : Doc/
-- DataType : DataType
-
-fg=blue
-</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>497</x>
-      <y>329</y>
-      <w>154</w>
-      <h>63</h>
-    </coordinates>
-    <panel_attributes>Event
---
-*@ name : text*
-/@ optional : boolean = false/
-/- Doc : Doc/
-/* Data : DataPoint/
-
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>406</x>
-      <y>231</y>
-      <w>105</w>
-      <h>126</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1= 0..*
-</panel_attributes>
-    <additional_attributes>130.0;150.0;80.0;150.0;80.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>259</x>
-      <y>280</y>
-      <w>154</w>
-      <h>21</h>
-    </coordinates>
-    <panel_attributes>Module
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>168</x>
-      <y>280</y>
-      <w>105</w>
-      <h>98</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-
-</panel_attributes>
-    <additional_attributes>130.0;10.0;80.0;10.0;80.0;120.0;10.0;120.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>322</x>
-      <y>252</y>
-      <w>21</w>
-      <h>42</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;-
-</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;40.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>21</x>
-      <y>217</y>
-      <w>154</w>
-      <h>77</h>
-    </coordinates>
-    <panel_attributes>Device
---
-*@ id : Name*
-/- Doc : Doc/
-/* Properties : Property/
-/* Modules : Module/
-/* SubDevices : SubDevice/
-fg=blue</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>168</x>
-      <y>280</y>
-      <w>49</w>
-      <h>56</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1=0..*
-</panel_attributes>
-    <additional_attributes>10.0;50.0;40.0;50.0;40.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>168</x>
-      <y>252</y>
-      <w>105</w>
-      <h>56</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1= 0..*
-</panel_attributes>
-    <additional_attributes>130.0;50.0;80.0;50.0;80.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>168</x>
-      <y>266</y>
-      <w>105</w>
-      <h>70</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.</panel_attributes>
-    <additional_attributes>130.0;80.0;60.0;80.0;60.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>259</x>
-      <y>315</y>
-      <w>154</w>
-      <h>77</h>
-    </coordinates>
-    <panel_attributes>Property
---
-*@ name : text*
-/@ optional : boolean = false/
-/@ value : text/
-/- Doc : Doc/
-- DataType : SimpleType
-fg=blue
-transparency=80</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>644</x>
-      <y>217</y>
-      <w>56</w>
-      <h>147</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1=0..*
-</panel_attributes>
-    <additional_attributes>10.0;10.0;60.0;10.0;60.0;190.0;10.0;190.0</additional_attributes>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>406</x>
-      <y>245</y>
-      <w>49</w>
-      <h>98</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;.
-m1=0..*</panel_attributes>
-    <additional_attributes>10.0;110.0;50.0;110.0;50.0;10.0;10.0;10.0</additional_attributes>
-  </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>231</x>
-      <y>777</y>
-      <w>133</w>
-      <h>70</h>
-    </coordinates>
-    <panel_attributes>&lt;&lt;enumeration&gt;&gt;
-TypeChoice
---
-SimpleType : SimpleType
-Struct : StructType
-Array : ArrayType 
-
-</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>147</x>
-      <y>784</y>
-      <w>98</w>
-      <h>63</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;-
-m1= 1
-</panel_attributes>
-    <additional_attributes>120.0;10.0;80.0;10.0;80.0;70.0;10.0;70.0</additional_attributes>
-  </element>
-</diagram>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<diagram program="umlet" version="14.2">
+  <help_text/>
+  <zoom_level>7</zoom_level>
+  <element>
+    <id>UMLNote</id>
+    <coordinates>
+      <x>938</x>
+      <y>532</y>
+      <w>217</w>
+      <h>182</h>
+    </coordinates>
+    <panel_attributes>bg=#FAF8C8
+fontsize=12
+/@ optional elementAttribute/
+/@ optional elementAttribute = default value/
+*@ mandatoryElementAttribute*
+- mandatory element : Subclass  (exact one)
+/- optionalElement : SubClass      (zero or one)/
+/* optionalElement : SubClass      (zero or many)/
+
+"Depends" Relation
+and Cardinality
+
+Subclassing
+
+Cardinalities:
+0,1  : zero or one
+1     : exact one
+0..* : zero or many
+1..* : at least one or many
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1029</x>
+      <y>602</y>
+      <w>77</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+fontsize=10
+m1=0..*
+</panel_attributes>
+    <additional_attributes>90.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1029</x>
+      <y>630</y>
+      <w>77</w>
+      <h>21</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-
+fontsize=10</panel_attributes>
+    <additional_attributes>90.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>1099</x>
+      <y>854</y>
+      <w>105</w>
+      <h>154</h>
+    </coordinates>
+    <panel_attributes>&lt;&lt;enumeration&gt;&gt;
+BasicType
+--
+boolean
+byte
+integer
+float
+string
+enum
+date
+time
+datetime
+blob
+uri</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>805</x>
+      <y>917</y>
+      <w>98</w>
+      <h>56</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.
+m1= 0,1
+</panel_attributes>
+    <additional_attributes>120.0;50.0;60.0;50.0;60.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>805</x>
+      <y>861</y>
+      <w>98</w>
+      <h>56</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.
+m1= 0,1
+</panel_attributes>
+    <additional_attributes>120.0;10.0;40.0;10.0;40.0;60.0;10.0;60.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>469</x>
+      <y>861</y>
+      <w>133</w>
+      <h>84</h>
+    </coordinates>
+    <panel_attributes>DataType
+--
+/@ name : text/
+/@ unitOfMeasure : text/
+/- Doc : Doc/
+- TypeChoice
+/* Constraints : Constraint/
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>574</x>
+      <y>819</y>
+      <w>490</w>
+      <h>91</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.
+m2=1..*
+</panel_attributes>
+    <additional_attributes>10.0;60.0;10.0;20.0;680.0;20.0;680.0;100.0;640.0;100.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>574</x>
+      <y>819</y>
+      <w>490</w>
+      <h>133</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.
+m2=1
+</panel_attributes>
+    <additional_attributes>10.0;60.0;10.0;20.0;680.0;20.0;680.0;160.0;640.0;160.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>889</x>
+      <y>945</y>
+      <w>133</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>SimpleType
+--
+*@ type : BasicType*
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1015</x>
+      <y>959</y>
+      <w>98</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-
+m1= 1
+</panel_attributes>
+    <additional_attributes>120.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>889</x>
+      <y>1001</y>
+      <w>133</w>
+      <h>70</h>
+    </coordinates>
+    <panel_attributes>Constraint
+--
+*@ name : text*
+/@ type : BasicType/
+/@ value : text/
+/- Doc : Doc/
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>595</x>
+      <y>931</y>
+      <w>308</w>
+      <h>98</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0..*
+</panel_attributes>
+    <additional_attributes>420.0;110.0;340.0;110.0;340.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1015</x>
+      <y>1001</y>
+      <w>147</w>
+      <h>56</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-
+m1=1
+</panel_attributes>
+    <additional_attributes>190.0;10.0;190.0;60.0;10.0;60.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>889</x>
+      <y>861</y>
+      <w>133</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>StructType
+--
+- DataType : DataType
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>889</x>
+      <y>903</y>
+      <w>133</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>ArrayType
+--
+- DataType : DataType
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>805</x>
+      <y>896</y>
+      <w>98</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;.
+m1= 0,1
+
+</panel_attributes>
+    <additional_attributes>120.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>469</x>
+      <y>756</y>
+      <w>735</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>halign=center
+SDT 4.0 - DataType
+fontsize=24
+bg=gray
+lw=0.1</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>469</x>
+      <y>91</y>
+      <w>840</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>SDT 4.0 - Basic Elements
+halign=center
+fontsize=24
+bg=gray
+lw=0.1</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>707</x>
+      <y>210</y>
+      <w>154</w>
+      <h>133</h>
+    </coordinates>
+    <panel_attributes>ModuleClass
+--
+*@ name : text*
+/@ optional : boolean = false/
+/- Doc : Doc/
+/- extends/
+/   @domain : IDRF/
+/   @class : text /
+/* Properties : Property/
+/* Actions : Action/
+/* Data : DataPoint/
+/* Events : Event/
+fg=blue
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>945</x>
+      <y>210</y>
+      <w>154</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>Action
+--
+*@ name : text*
+/@ optional : boolean = false/
+/- Doc : Doc/
+/- DataType : DataType/
+/* Args : Arg/
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>1190</x>
+      <y>273</y>
+      <w>119</w>
+      <h>56</h>
+    </coordinates>
+    <panel_attributes>Arg
+--
+*@ name ; text*
+/- Doc : Doc/
+- DataType : DataType
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1092</x>
+      <y>273</y>
+      <w>112</w>
+      <h>28</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*</panel_attributes>
+    <additional_attributes>140.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>469</x>
+      <y>210</y>
+      <w>154</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>Domain
+--
+*@ id : ID*
+/- Doc : Doc/
+/* imports/
+/* ModuleClasses : ModuleClass/
+/* Devices : Device/
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>616</x>
+      <y>210</y>
+      <w>105</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*</panel_attributes>
+    <additional_attributes>130.0;10.0;50.0;10.0;50.0;70.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>469</x>
+      <y>392</y>
+      <w>154</w>
+      <h>70</h>
+    </coordinates>
+    <panel_attributes>SubDevice
+--
+*@ id : Name*
+/- Doc : Doc/
+/* Properties : Property/
+/* ModuleClasses : ModuleClass/
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>616</x>
+      <y>266</y>
+      <w>49</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0..*
+</panel_attributes>
+    <additional_attributes>10.0;60.0;50.0;60.0;50.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>616</x>
+      <y>399</y>
+      <w>105</w>
+      <h>49</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*</panel_attributes>
+    <additional_attributes>130.0;10.0;60.0;10.0;60.0;50.0;10.0;50.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>1190</x>
+      <y>441</y>
+      <w>119</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>Doc
+--
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>854</x>
+      <y>210</y>
+      <w>105</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*
+</panel_attributes>
+    <additional_attributes>130.0;10.0;50.0;10.0;50.0;40.0;10.0;40.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1134</x>
+      <y>434</y>
+      <w>70</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0,1
+</panel_attributes>
+    <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>854</x>
+      <y>245</y>
+      <w>105</w>
+      <h>84</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*
+</panel_attributes>
+    <additional_attributes>130.0;90.0;50.0;90.0;50.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>945</x>
+      <y>301</y>
+      <w>154</w>
+      <h>98</h>
+    </coordinates>
+    <panel_attributes>DataPoint
+--
+*@ name : text*
+/@ optional : boolean = false/
+/@ writable : boolean = true/
+/@ readable : boolean = true/
+/@ eventable : boolean = false/
+/- Doc : Doc/
+- DataType : DataType
+
+fg=blue
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>945</x>
+      <y>413</y>
+      <w>154</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>Event
+--
+*@ name : text*
+/@ optional : boolean = false/
+/- Doc : Doc/
+/* Data : DataPoint/
+
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>854</x>
+      <y>315</y>
+      <w>105</w>
+      <h>126</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*
+</panel_attributes>
+    <additional_attributes>130.0;150.0;80.0;150.0;80.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>616</x>
+      <y>315</y>
+      <w>105</w>
+      <h>147</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+
+</panel_attributes>
+    <additional_attributes>130.0;10.0;80.0;10.0;80.0;190.0;10.0;190.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>469</x>
+      <y>301</y>
+      <w>154</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>DeviceClass
+--
+*@ id : Name*
+/- Doc : Doc/
+/* Properties : Property/
+/* ModuleClasses : ModuleClass/
+/* SubDevices : SubDevice/
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>616</x>
+      <y>364</y>
+      <w>42</w>
+      <h>56</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0..*
+</panel_attributes>
+    <additional_attributes>10.0;50.0;40.0;50.0;40.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>616</x>
+      <y>315</y>
+      <w>105</w>
+      <h>42</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*
+</panel_attributes>
+    <additional_attributes>130.0;10.0;80.0;10.0;80.0;40.0;10.0;40.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>616</x>
+      <y>350</y>
+      <w>105</w>
+      <h>70</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.</panel_attributes>
+    <additional_attributes>130.0;80.0;60.0;80.0;60.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>707</x>
+      <y>399</y>
+      <w>154</w>
+      <h>77</h>
+    </coordinates>
+    <panel_attributes>Property
+--
+*@ name : text*
+/@ optional : boolean = false/
+/@ value : text/
+/- Doc : Doc/
+- DataType : SimpleType
+fg=blue
+transparency=80</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1092</x>
+      <y>301</y>
+      <w>56</w>
+      <h>147</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0..*
+</panel_attributes>
+    <additional_attributes>10.0;10.0;60.0;10.0;60.0;190.0;10.0;190.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>854</x>
+      <y>329</y>
+      <w>49</w>
+      <h>98</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0..*</panel_attributes>
+    <additional_attributes>10.0;110.0;50.0;110.0;50.0;10.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>679</x>
+      <y>861</y>
+      <w>133</w>
+      <h>70</h>
+    </coordinates>
+    <panel_attributes>&lt;&lt;enumeration&gt;&gt;
+TypeChoice
+--
+SimpleType : SimpleType
+Struct : StructType
+Array : ArrayType 
+
+</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>595</x>
+      <y>868</y>
+      <w>98</w>
+      <h>63</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-
+m1= 1
+</panel_attributes>
+    <additional_attributes>120.0;10.0;80.0;10.0;80.0;70.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>210</x>
+      <y>301</y>
+      <w>210</w>
+      <h>133</h>
+    </coordinates>
+    <panel_attributes>Product
+--
+*@ name : text*
+/- Doc : Doc/
+/- extends/
+/   @domain : IDRF/
+/   @class : text /
+/   -ImplementedProperties : Property /
+/   -ImplementedModuleClasses : ModuleClass  /
+/* Properties : Property/
+/* ModuleClasses : ModuleClass/
+/* SubDevices : SubDevice/
+fg=blue</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>413</x>
+      <y>294</y>
+      <w>70</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;&lt;-
+m1= 0,1
+</panel_attributes>
+    <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>343</x>
+      <y>182</y>
+      <w>378</w>
+      <h>133</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*</panel_attributes>
+    <additional_attributes>520.0;50.0;440.0;50.0;440.0;10.0;10.0;10.0;10.0;170.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>343</x>
+      <y>427</y>
+      <w>378</w>
+      <h>91</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1= 0..*</panel_attributes>
+    <additional_attributes>520.0;50.0;430.0;50.0;430.0;110.0;10.0;110.0;10.0;10.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>413</x>
+      <y>385</y>
+      <w>70</w>
+      <h>35</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0..*
+</panel_attributes>
+    <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes>
+  </element>
+</diagram>
diff --git a/SDT/schema4.0/docs/images/Product.png b/SDT/schema4.0/docs/images/Product.png
index 4f37956147dd07096e17915e6d16664e3a37a01a..95bbbeb625a9be95a7b1583e295f346903f1d667 100644
Binary files a/SDT/schema4.0/docs/images/Product.png and b/SDT/schema4.0/docs/images/Product.png differ
diff --git a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
index 98121276a51889da2c842e80ddfd50a1a807ae0a..8ea79932f20addf89dc931185e782d990c6f6d9c 100644
Binary files a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png and b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png differ
diff --git a/SDT/schema4.0/docs/images/SDT_simplified.png b/SDT/schema4.0/docs/images/SDT_simplified.png
index 041738b3536a9d7454aaf2a024f0c76a8c33a22e..aebda03d0aed3007d010fa2117b2a51254999707 100644
Binary files a/SDT/schema4.0/docs/images/SDT_simplified.png and b/SDT/schema4.0/docs/images/SDT_simplified.png differ