diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf
index 6e7aeac12675b01f282886f50b0fe3e0f28ab1fa..13320991c98f73a9458ba7a160be63b0f4bcd321 100644
--- a/SDT/schema4.0/docs/SDT_UML.uxf
+++ b/SDT/schema4.0/docs/SDT_UML.uxf
@@ -5,7 +5,7 @@
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>1128</x>
+      <x>1056</x>
       <y>1352</y>
       <w>232</w>
       <h>208</h>
@@ -36,7 +36,7 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1232</x>
+      <x>1160</x>
       <y>1432</y>
       <w>88</w>
       <h>32</h>
@@ -51,7 +51,7 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1232</x>
+      <x>1160</x>
       <y>1464</y>
       <w>88</w>
       <h>24</h>
@@ -64,7 +64,7 @@ group=1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1240</x>
+      <x>1168</x>
       <y>984</y>
       <w>120</w>
       <h>176</h>
@@ -88,7 +88,7 @@ void</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>744</x>
+      <x>672</x>
       <y>1048</y>
       <w>112</w>
       <h>64</h>
@@ -101,7 +101,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>744</x>
+      <x>672</x>
       <y>984</y>
       <w>112</w>
       <h>64</h>
@@ -114,7 +114,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>360</x>
+      <x>288</x>
       <y>984</y>
       <w>152</w>
       <h>120</h>
@@ -134,7 +134,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>504</x>
+      <x>432</x>
       <y>944</y>
       <w>544</w>
       <h>96</h>
@@ -147,7 +147,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>504</x>
+      <x>432</x>
       <y>944</y>
       <w>544</w>
       <h>144</h>
@@ -160,7 +160,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>840</x>
+      <x>768</x>
       <y>1080</y>
       <w>152</w>
       <h>40</h>
@@ -174,7 +174,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>984</x>
+      <x>912</x>
       <y>1104</y>
       <w>272</w>
       <h>32</h>
@@ -187,7 +187,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>840</x>
+      <x>768</x>
       <y>1176</y>
       <w>152</w>
       <h>88</h>
@@ -205,7 +205,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>504</x>
+      <x>432</x>
       <y>1064</y>
       <w>352</w>
       <h>144</h>
@@ -218,7 +218,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>984</x>
+      <x>912</x>
       <y>1152</y>
       <w>336</w>
       <h>112</h>
@@ -231,7 +231,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>840</x>
+      <x>768</x>
       <y>984</y>
       <w>152</w>
       <h>40</h>
@@ -245,7 +245,7 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>840</x>
+      <x>768</x>
       <y>1032</y>
       <w>152</w>
       <h>40</h>
@@ -259,7 +259,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>744</x>
+      <x>672</x>
       <y>1024</y>
       <w>112</w>
       <h>40</h>
@@ -273,7 +273,7 @@ fontsize=12
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>360</x>
+      <x>288</x>
       <y>872</y>
       <w>1000</w>
       <h>32</h>
@@ -288,7 +288,7 @@ lw=0.1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>72</x>
+      <x>0</x>
       <y>0</y>
       <w>1288</w>
       <h>32</h>
@@ -303,7 +303,7 @@ lw=0.1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>640</x>
+      <x>568</x>
       <y>104</y>
       <w>192</w>
       <h>168</h>
@@ -328,7 +328,7 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>920</x>
+      <x>848</x>
       <y>104</y>
       <w>176</w>
       <h>104</h>
@@ -347,7 +347,7 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1192</x>
+      <x>1120</x>
       <y>176</y>
       <w>168</w>
       <h>104</h>
@@ -366,7 +366,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1088</x>
+      <x>1016</x>
       <y>176</y>
       <w>120</w>
       <h>32</h>
@@ -379,7 +379,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>88</x>
+      <x>16</x>
       <y>104</y>
       <w>184</w>
       <h>144</h>
@@ -401,7 +401,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>104</y>
       <w>136</w>
       <h>64</h>
@@ -414,7 +414,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>352</x>
+      <x>280</x>
       <y>352</y>
       <w>176</w>
       <h>128</h>
@@ -435,7 +435,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>200</y>
       <w>56</w>
       <h>72</h>
@@ -448,7 +448,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>280</y>
       <w>136</w>
       <h>128</h>
@@ -461,7 +461,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1192</x>
+      <x>1120</x>
       <y>400</y>
       <w>168</w>
       <h>40</h>
@@ -474,7 +474,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>824</x>
+      <x>752</x>
       <y>104</y>
       <w>112</w>
       <h>56</h>
@@ -487,7 +487,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1144</x>
+      <x>1072</x>
       <y>400</y>
       <w>64</w>
       <h>32</h>
@@ -500,7 +500,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>824</x>
+      <x>752</x>
       <y>152</y>
       <w>112</w>
       <h>96</h>
@@ -513,7 +513,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>920</x>
+      <x>848</x>
       <y>216</y>
       <w>176</w>
       <h>144</h>
@@ -537,7 +537,7 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>920</x>
+      <x>848</x>
       <y>368</y>
       <w>176</w>
       <h>88</h>
@@ -555,7 +555,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>824</x>
+      <x>752</x>
       <y>232</y>
       <w>112</w>
       <h>168</h>
@@ -568,7 +568,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>104</y>
       <w>136</w>
       <h>336</h>
@@ -581,7 +581,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>352</x>
+      <x>280</x>
       <y>240</y>
       <w>176</w>
       <h>104</h>
@@ -600,7 +600,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>320</y>
       <w>64</w>
       <h>64</h>
@@ -613,7 +613,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>104</y>
       <w>136</w>
       <h>224</h>
@@ -625,7 +625,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>280</y>
       <w>136</w>
       <h>32</h>
@@ -636,7 +636,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>640</x>
+      <x>568</x>
       <y>280</y>
       <w>192</w>
       <h>104</h>
@@ -656,7 +656,7 @@ transparency=80</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1088</x>
+      <x>1016</x>
       <y>104</y>
       <w>56</w>
       <h>320</h>
@@ -669,7 +669,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>824</x>
+      <x>752</x>
       <y>232</y>
       <w>56</w>
       <h>80</h>
@@ -682,7 +682,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>600</x>
+      <x>528</x>
       <y>992</y>
       <w>152</w>
       <h>88</h>
@@ -690,7 +690,7 @@ fontsize=12</panel_attributes>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 TypeChoice
 --
-SimpleType : Simple
+Simple : Simple
 Struct : Struct
 Array : Array
 Enum : Enum
@@ -701,7 +701,7 @@ Enum : Enum
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>504</x>
+      <x>432</x>
       <y>1000</y>
       <w>112</w>
       <h>64</h>
@@ -714,7 +714,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>168</y>
       <w>136</w>
       <h>136</h>
@@ -726,7 +726,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>264</x>
+      <x>192</x>
       <y>72</y>
       <w>392</w>
       <h>88</h>
@@ -738,7 +738,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>520</x>
+      <x>448</x>
       <y>184</y>
       <w>64</w>
       <h>192</h>
@@ -751,7 +751,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>840</x>
+      <x>768</x>
       <y>1128</y>
       <w>152</w>
       <h>40</h>
@@ -765,7 +765,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>744</x>
+      <x>672</x>
       <y>1056</y>
       <w>112</w>
       <h>104</h>
@@ -778,7 +778,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1040</x>
+      <x>968</x>
       <y>1144</y>
       <w>168</w>
       <h>88</h>
@@ -796,7 +796,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>984</x>
+      <x>912</x>
       <y>1144</y>
       <w>72</w>
       <h>32</h>
@@ -809,7 +809,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1200</x>
+      <x>1128</x>
       <y>1152</y>
       <w>88</w>
       <h>64</h>
@@ -822,7 +822,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>408</x>
+      <x>336</x>
       <y>624</y>
       <w>176</w>
       <h>64</h>
@@ -839,7 +839,7 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>904</x>
+      <x>832</x>
       <y>624</y>
       <w>192</w>
       <h>56</h>
@@ -854,7 +854,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>832</x>
+      <x>760</x>
       <y>624</y>
       <w>88</w>
       <h>56</h>
@@ -868,7 +868,7 @@ fontsize=12
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>360</x>
+      <x>288</x>
       <y>624</y>
       <w>64</w>
       <h>32</h>
@@ -881,7 +881,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1184</x>
+      <x>1112</x>
       <y>624</y>
       <w>176</w>
       <h>128</h>
@@ -902,7 +902,7 @@ subdevice
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1088</x>
+      <x>1016</x>
       <y>624</y>
       <w>112</w>
       <h>56</h>
@@ -915,7 +915,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>904</x>
+      <x>832</x>
       <y>688</y>
       <w>192</w>
       <h>56</h>
@@ -930,7 +930,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>832</x>
+      <x>760</x>
       <y>672</y>
       <w>88</w>
       <h>48</h>
@@ -944,7 +944,7 @@ fontsize=12
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1088</x>
+      <x>1016</x>
       <y>624</y>
       <w>112</w>
       <h>120</h>
@@ -957,7 +957,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>664</x>
+      <x>592</x>
       <y>624</y>
       <w>176</w>
       <h>64</h>
@@ -975,7 +975,7 @@ Includes : Include
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>576</x>
+      <x>504</x>
       <y>632</y>
       <w>104</w>
       <h>56</h>
@@ -989,7 +989,7 @@ fontsize=12
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>352</x>
+      <x>280</x>
       <y>104</y>
       <w>176</w>
       <h>128</h>
@@ -1011,7 +1011,7 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>264</x>
+      <x>192</x>
       <y>200</y>
       <w>104</w>
       <h>72</h>
@@ -1024,7 +1024,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>264</x>
+      <x>192</x>
       <y>104</y>
       <w>104</w>
       <h>104</h>
@@ -1037,7 +1037,7 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>360</x>
+      <x>288</x>
       <y>536</y>
       <w>1000</w>
       <h>32</h>
@@ -1052,7 +1052,7 @@ lw=0.1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>264</x>
+      <x>192</x>
       <y>216</y>
       <w>104</w>
       <h>168</h>
diff --git a/SDT/schema4.0/docs/images/Array.png b/SDT/schema4.0/docs/images/Array.png
index 30982dc73b44c1033c96314b66f5df7be8fda1c7..67e06df30855bfc6ec2f888ab5f42aa9eb196a6c 100644
Binary files a/SDT/schema4.0/docs/images/Array.png and b/SDT/schema4.0/docs/images/Array.png differ
diff --git a/SDT/schema4.0/docs/images/Enum.png b/SDT/schema4.0/docs/images/Enum.png
index db3738a8b77db61aefae50fafaec58079d1d0556..4e6f7f822d52bb4fe04458dbba4da72a6d43acfa 100644
Binary files a/SDT/schema4.0/docs/images/Enum.png and b/SDT/schema4.0/docs/images/Enum.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 743d3ac3d9a3632dc06b512e66ad621042131a81..e2372f1832206b715ef1e2b4b96e2737b82e53cc 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
diff --git a/SDT/schema4.0/docs/images/SimpleType.png b/SDT/schema4.0/docs/images/SimpleType.png
index 4a3c7b61e4edad95d5d78220f982bc720484a08a..1e064804a1a894edc46002561870d5602da917d3 100644
Binary files a/SDT/schema4.0/docs/images/SimpleType.png and b/SDT/schema4.0/docs/images/SimpleType.png differ
diff --git a/SDT/schema4.0/docs/images/Struct.png b/SDT/schema4.0/docs/images/Struct.png
index 4e4c9984f6418980683ab633aec15699eee686fd..08a48cb06577bb22e71f1f94627c3643de6cb17e 100644
Binary files a/SDT/schema4.0/docs/images/Struct.png and b/SDT/schema4.0/docs/images/Struct.png differ