diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf
index a5b93b195d3a1ff0c3a585a1505bb5b5f7cf3e5c..58dcfc986dd9089a294e36991142ac180c99efcb 100644
--- a/SDT/schema4.0/docs/SDT_UML.uxf
+++ b/SDT/schema4.0/docs/SDT_UML.uxf
@@ -6,7 +6,7 @@
<id>UMLNote</id>
<coordinates>
<x>1390</x>
- <y>690</y>
+ <y>650</y>
<w>310</w>
<h>260</h>
</coordinates>
@@ -37,7 +37,7 @@ group=1</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1520</x>
- <y>790</y>
+ <y>750</y>
<w>110</w>
<h>40</h>
</coordinates>
@@ -52,7 +52,7 @@ group=1</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1520</x>
- <y>830</y>
+ <y>790</y>
<w>110</w>
<h>30</h>
</coordinates>
@@ -65,7 +65,7 @@ group=1</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1580</x>
- <y>1130</y>
+ <y>1090</y>
<w>150</w>
<h>220</h>
</coordinates>
@@ -89,7 +89,7 @@ void</panel_attributes>
<id>Relation</id>
<coordinates>
<x>960</x>
- <y>1210</y>
+ <y>1170</y>
<w>140</w>
<h>80</h>
</coordinates>
@@ -102,7 +102,7 @@ m1= 0..1
<id>Relation</id>
<coordinates>
<x>960</x>
- <y>1130</y>
+ <y>1090</y>
<w>140</w>
<h>80</h>
</coordinates>
@@ -115,13 +115,13 @@ m1=0..1
<id>UMLClass</id>
<coordinates>
<x>480</x>
- <y>1130</y>
+ <y>1090</y>
<w>190</w>
<h>150</h>
</coordinates>
<panel_attributes>DataType
--
-/@ name : text/
+/@ name : Name/
/@ unitOfMeasure : text/
/- Doc : Doc/
/- semanticURI : uri/
@@ -135,7 +135,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>630</x>
- <y>1070</y>
+ <y>1030</y>
<w>710</w>
<h>130</h>
</coordinates>
@@ -148,7 +148,7 @@ m2=1..n
<id>Relation</id>
<coordinates>
<x>630</x>
- <y>1070</y>
+ <y>1030</y>
<w>710</w>
<h>190</h>
</coordinates>
@@ -161,7 +161,7 @@ m2=1
<id>UMLClass</id>
<coordinates>
<x>1080</x>
- <y>1250</y>
+ <y>1210</y>
<w>190</w>
<h>50</h>
</coordinates>
@@ -175,7 +175,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1260</x>
- <y>1270</y>
+ <y>1230</y>
<w>340</w>
<h>50</h>
</coordinates>
@@ -188,13 +188,13 @@ m1= 1
<id>UMLClass</id>
<coordinates>
<x>1080</x>
- <y>1370</y>
+ <y>1330</y>
<w>190</w>
<h>110</h>
</coordinates>
<panel_attributes>Constraint
--
-*@ name : text*
+*@ name : Name*
/@ type : BasicType/
/@ value : text/
/- Doc : Doc/
@@ -206,7 +206,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>660</x>
- <y>1230</y>
+ <y>1190</y>
<w>440</w>
<h>180</h>
</coordinates>
@@ -219,7 +219,7 @@ m1=0..n
<id>Relation</id>
<coordinates>
<x>1260</x>
- <y>1340</y>
+ <y>1300</y>
<w>420</w>
<h>140</h>
</coordinates>
@@ -232,7 +232,7 @@ m1=1
<id>UMLClass</id>
<coordinates>
<x>1080</x>
- <y>1130</y>
+ <y>1090</y>
<w>190</w>
<h>50</h>
</coordinates>
@@ -246,7 +246,7 @@ fg=blue</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1080</x>
- <y>1190</y>
+ <y>1150</y>
<w>190</w>
<h>50</h>
</coordinates>
@@ -260,7 +260,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>960</x>
- <y>1180</y>
+ <y>1140</y>
<w>140</w>
<h>50</h>
</coordinates>
@@ -274,7 +274,7 @@ m1= 0..1
<id>UMLClass</id>
<coordinates>
<x>480</x>
- <y>990</y>
+ <y>950</y>
<w>1250</w>
<h>40</h>
</coordinates>
@@ -289,7 +289,7 @@ lw=0.1</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>100</x>
- <y>40</y>
+ <y>0</y>
<w>1590</w>
<h>40</h>
</coordinates>
@@ -304,13 +304,13 @@ lw=0.1</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>830</x>
- <y>170</y>
+ <y>130</y>
<w>220</w>
<h>180</h>
</coordinates>
<panel_attributes>ModuleClass
--
-*@ name : text*
+*@ name : Name*
/@ optional : boolean = false/
/- Doc : Doc/
/- semanticURI : uri/
@@ -327,13 +327,13 @@ fg=blue
<id>UMLClass</id>
<coordinates>
<x>1170</x>
- <y>170</y>
+ <y>130</y>
<w>220</w>
<h>130</h>
</coordinates>
<panel_attributes>Action
--
-*@ name : text*
+*@ name : Name*
/@ optional : boolean = false/
/- Doc : Doc/
/- semanticURI : uri/
@@ -346,13 +346,13 @@ fg=blue</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1520</x>
- <y>260</y>
+ <y>220</y>
<w>170</w>
<h>100</h>
</coordinates>
<panel_attributes>Arg
--
-*@ name ; text*
+*@ name ; Name*
/- Doc : Doc/
/- semanticURI : uri/
- DataType : DataType
@@ -363,7 +363,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1380</x>
- <y>260</y>
+ <y>220</y>
<w>160</w>
<h>40</h>
</coordinates>
@@ -375,13 +375,13 @@ m1= 0..n</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>490</x>
- <y>170</y>
+ <y>130</y>
<w>220</w>
<h>150</h>
</coordinates>
<panel_attributes>Domain
--
-*@ id : ID*
+*@ id : Name*
/- Doc : Doc/
/- semanticURI : uri/
/* imports/
@@ -395,7 +395,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>170</y>
+ <y>130</y>
<w>150</w>
<h>100</h>
</coordinates>
@@ -407,7 +407,7 @@ m1= 0..n</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>490</x>
- <y>480</y>
+ <y>440</y>
<w>220</w>
<h>110</h>
</coordinates>
@@ -425,7 +425,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>260</y>
+ <y>220</y>
<w>70</w>
<h>120</h>
</coordinates>
@@ -438,7 +438,7 @@ m1=0..n
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>480</y>
+ <y>440</y>
<w>150</w>
<h>70</h>
</coordinates>
@@ -450,7 +450,7 @@ m1= 0..n</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1520</x>
- <y>540</y>
+ <y>500</y>
<w>170</w>
<h>50</h>
</coordinates>
@@ -463,7 +463,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1040</x>
- <y>170</y>
+ <y>130</y>
<w>150</w>
<h>70</h>
</coordinates>
@@ -476,7 +476,7 @@ m1= 0..n
<id>Relation</id>
<coordinates>
<x>1440</x>
- <y>540</y>
+ <y>500</y>
<w>100</w>
<h>40</h>
</coordinates>
@@ -488,7 +488,7 @@ m1=0..1</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1040</x>
- <y>230</y>
+ <y>190</y>
<w>150</w>
<h>120</h>
</coordinates>
@@ -501,13 +501,13 @@ m1= 0..n
<id>UMLClass</id>
<coordinates>
<x>1170</x>
- <y>310</y>
+ <y>270</y>
<w>220</w>
<h>160</h>
</coordinates>
<panel_attributes>DataPoint
--
-*@ name : text*
+*@ name : Name*
/@ optional : boolean = false/
/@ writable : boolean = true/
/@ readable : boolean = true/
@@ -524,13 +524,13 @@ fg=blue
<id>UMLClass</id>
<coordinates>
<x>1170</x>
- <y>480</y>
+ <y>440</y>
<w>220</w>
<h>110</h>
</coordinates>
<panel_attributes>Event
--
-*@ name : text*
+*@ name : Name*
/@ optional : boolean = false/
/- Doc : Doc/
/- semanticURI : uri/
@@ -543,7 +543,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1040</x>
- <y>330</y>
+ <y>290</y>
<w>150</w>
<h>190</h>
</coordinates>
@@ -556,7 +556,7 @@ m1= 0..n
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>330</y>
+ <y>290</y>
<w>150</w>
<h>240</h>
</coordinates>
@@ -569,7 +569,7 @@ m1= 0..n
<id>UMLClass</id>
<coordinates>
<x>490</x>
- <y>340</y>
+ <y>300</y>
<w>220</w>
<h>130</h>
</coordinates>
@@ -588,7 +588,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>430</y>
+ <y>390</y>
<w>70</w>
<h>100</h>
</coordinates>
@@ -600,7 +600,7 @@ m1=0..n</panel_attributes>
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>330</y>
+ <y>290</y>
<w>150</w>
<h>90</h>
</coordinates>
@@ -612,7 +612,7 @@ m1= 0..n</panel_attributes>
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>410</y>
+ <y>370</y>
<w>150</w>
<h>100</h>
</coordinates>
@@ -623,13 +623,13 @@ m1= 0..n</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>830</x>
- <y>460</y>
+ <y>420</y>
<w>220</w>
<h>130</h>
</coordinates>
<panel_attributes>Property
--
-*@ name : text*
+*@ name : Name*
/@ optional : boolean = false/
/@ value : text/
/- Doc : Doc/
@@ -643,7 +643,7 @@ transparency=80</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1380</x>
- <y>290</y>
+ <y>250</y>
<w>80</w>
<h>260</h>
</coordinates>
@@ -656,7 +656,7 @@ m1=0..n
<id>Relation</id>
<coordinates>
<x>1040</x>
- <y>330</y>
+ <y>290</y>
<w>70</w>
<h>190</h>
</coordinates>
@@ -668,7 +668,7 @@ m1=0..n</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>780</x>
- <y>1140</y>
+ <y>1100</y>
<w>190</w>
<h>110</h>
</coordinates>
@@ -687,7 +687,7 @@ Enum : EnumType
<id>Relation</id>
<coordinates>
<x>660</x>
- <y>1150</y>
+ <y>1110</y>
<w>140</w>
<h>80</h>
</coordinates>
@@ -700,7 +700,7 @@ m1= 1
<id>UMLClass</id>
<coordinates>
<x>100</x>
- <y>360</y>
+ <y>320</y>
<w>330</w>
<h>230</h>
</coordinates>
@@ -725,7 +725,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>420</x>
- <y>350</y>
+ <y>310</y>
<w>90</w>
<h>50</h>
</coordinates>
@@ -738,7 +738,7 @@ m1=0..1
<id>Relation</id>
<coordinates>
<x>280</x>
- <y>140</y>
+ <y>100</y>
<w>570</w>
<h>240</h>
</coordinates>
@@ -750,7 +750,7 @@ m1=0..1
<id>Relation</id>
<coordinates>
<x>280</x>
- <y>560</y>
+ <y>520</y>
<w>570</w>
<h>90</h>
</coordinates>
@@ -762,7 +762,7 @@ m1= 0..n</panel_attributes>
<id>Relation</id>
<coordinates>
<x>420</x>
- <y>480</y>
+ <y>440</y>
<w>90</w>
<h>40</h>
</coordinates>
@@ -774,7 +774,7 @@ m1=0..n</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1080</x>
- <y>1310</y>
+ <y>1270</y>
<w>190</w>
<h>50</h>
</coordinates>
@@ -788,7 +788,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>960</x>
- <y>1220</y>
+ <y>1180</y>
<w>140</w>
<h>130</h>
</coordinates>
@@ -801,13 +801,13 @@ m1=0..1
<id>UMLClass</id>
<coordinates>
<x>1330</x>
- <y>1330</y>
+ <y>1290</y>
<w>210</w>
<h>110</h>
</coordinates>
<panel_attributes>EnumValue
--
-*@ name : text*
+*@ name : Name*
*@ value : value*
/@ type : BasicType = integer/
/- Doc : Doc/
@@ -819,7 +819,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1260</x>
- <y>1320</y>
+ <y>1280</y>
<w>90</w>
<h>50</h>
</coordinates>
@@ -832,7 +832,7 @@ m1=1..n
<id>Relation</id>
<coordinates>
<x>1530</x>
- <y>1340</y>
+ <y>1300</y>
<w>120</w>
<h>80</h>
</coordinates>
@@ -844,14 +844,14 @@ m1=0..1</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>490</x>
- <y>670</y>
+ <y>630</y>
<w>220</w>
<h>80</h>
</coordinates>
<panel_attributes>Extends
--
*@domain : IDRF*
-*@class : id*
+*@class : Name*
/- exclude : Exclude/
fg=blue</panel_attributes>
@@ -861,13 +861,13 @@ fg=blue</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>830</x>
- <y>670</y>
+ <y>630</y>
<w>220</w>
<h>70</h>
</coordinates>
<panel_attributes>Exclude
--
-*@name : text*
+*@name : Name*
/@type : text = datapoint/
fg=blue</panel_attributes>
<additional_attributes/>
@@ -876,7 +876,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>700</x>
- <y>670</y>
+ <y>630</y>
<w>150</w>
<h>80</h>
</coordinates>
@@ -888,7 +888,7 @@ m1= 0..n</panel_attributes>
<id>Relation</id>
<coordinates>
<x>410</x>
- <y>660</y>
+ <y>620</y>
<w>100</w>
<h>50</h>
</coordinates>
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 6c9b5bf3074a153e2f999987c46b49e6f6d30e4d..d708332cde94ebf648d20fda825d8552c88a9efd 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_UML_DataType.png b/SDT/schema4.0/docs/images/SDT_UML_DataType.png
index 4ff86055aa73d93a8158aac424b3dc3c166220d9..720b1eb14930ddded576100b14360c5da9aa0a88 100644
Binary files a/SDT/schema4.0/docs/images/SDT_UML_DataType.png and b/SDT/schema4.0/docs/images/SDT_UML_DataType.png differ