diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf
index e004e4e2ad8c58f03b75d97cb332b98656f559c2..4a94e6eb11cb63d605a0405b308d7866fd93ab74 100644
--- a/SDT/schema4.0/docs/SDT_UML.uxf
+++ b/SDT/schema4.0/docs/SDT_UML.uxf
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <diagram program="umlet" version="14.3.0">
   <help_text/>
-  <zoom_level>6</zoom_level>
+  <zoom_level>11</zoom_level>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>72</x>
-      <y>636</y>
-      <w>186</w>
-      <h>156</h>
+      <x>154</x>
+      <y>880</y>
+      <w>341</w>
+      <h>286</h>
     </coordinates>
     <panel_attributes>bg=#FAF8C8
 fontsize=12
@@ -36,10 +36,10 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>150</x>
-      <y>696</y>
-      <w>66</w>
-      <h>24</h>
+      <x>297</x>
+      <y>990</y>
+      <w>121</w>
+      <h>44</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 fontsize=10
@@ -51,10 +51,10 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>150</x>
-      <y>720</y>
-      <w>66</w>
-      <h>18</h>
+      <x>297</x>
+      <y>1034</y>
+      <w>121</w>
+      <h>33</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 fontsize=10
@@ -64,10 +64,10 @@ group=1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>978</x>
-      <y>810</y>
-      <w>90</w>
-      <h>132</h>
+      <x>1815</x>
+      <y>1199</y>
+      <w>165</w>
+      <h>242</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 BasicType
@@ -88,10 +88,10 @@ void</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>606</x>
-      <y>858</y>
-      <w>84</w>
-      <h>48</h>
+      <x>1133</x>
+      <y>1287</y>
+      <w>154</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1= 0..1
@@ -101,10 +101,10 @@ m1= 0..1
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>606</x>
-      <y>810</y>
-      <w>84</w>
-      <h>48</h>
+      <x>1133</x>
+      <y>1199</y>
+      <w>154</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1=0..1
@@ -114,10 +114,10 @@ m1=0..1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>318</x>
-      <y>810</y>
-      <w>114</w>
-      <h>90</h>
+      <x>605</x>
+      <y>1199</y>
+      <w>209</w>
+      <h>165</h>
     </coordinates>
     <panel_attributes>DataType
 --
@@ -134,10 +134,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>408</x>
-      <y>774</y>
-      <w>426</w>
-      <h>78</h>
+      <x>770</x>
+      <y>1133</y>
+      <w>781</w>
+      <h>143</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m2=1..n
@@ -147,10 +147,10 @@ m2=1..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>408</x>
-      <y>774</y>
-      <w>426</w>
-      <h>114</h>
+      <x>770</x>
+      <y>1133</y>
+      <w>781</w>
+      <h>209</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m2=1
@@ -160,10 +160,10 @@ m2=1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>678</x>
-      <y>882</y>
-      <w>114</w>
-      <h>30</h>
+      <x>1265</x>
+      <y>1331</y>
+      <w>209</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>SimpleType
 --
@@ -174,10 +174,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>786</x>
-      <y>894</y>
-      <w>204</w>
-      <h>30</h>
+      <x>1463</x>
+      <y>1353</y>
+      <w>374</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1= 1
@@ -187,10 +187,10 @@ m1= 1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>678</x>
-      <y>954</y>
-      <w>114</w>
-      <h>66</h>
+      <x>1265</x>
+      <y>1463</y>
+      <w>209</w>
+      <h>121</h>
     </coordinates>
     <panel_attributes>Constraint
 --
@@ -205,10 +205,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>426</x>
-      <y>870</y>
-      <w>264</w>
-      <h>108</h>
+      <x>803</x>
+      <y>1309</y>
+      <w>484</w>
+      <h>198</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n
@@ -218,10 +218,10 @@ m1=0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>786</x>
-      <y>936</y>
-      <w>252</w>
-      <h>84</h>
+      <x>1463</x>
+      <y>1430</y>
+      <w>462</w>
+      <h>154</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=1
@@ -231,10 +231,10 @@ m1=1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>678</x>
-      <y>810</y>
-      <w>114</w>
-      <h>30</h>
+      <x>1265</x>
+      <y>1199</y>
+      <w>209</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>StructType
 --
@@ -245,10 +245,10 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>678</x>
-      <y>846</y>
-      <w>114</w>
-      <h>30</h>
+      <x>1265</x>
+      <y>1265</y>
+      <w>209</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>ArrayType
 --
@@ -259,10 +259,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>606</x>
-      <y>840</y>
-      <w>84</w>
-      <h>30</h>
+      <x>1133</x>
+      <y>1254</y>
+      <w>154</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1= 0..1
@@ -273,10 +273,10 @@ m1= 0..1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>318</x>
-      <y>726</y>
-      <w>750</w>
-      <h>24</h>
+      <x>605</x>
+      <y>1045</y>
+      <w>1375</w>
+      <h>44</h>
     </coordinates>
     <panel_attributes>halign=center
 SDT 4.0 - DataType
@@ -288,10 +288,10 @@ lw=0.1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>90</x>
-      <y>156</y>
-      <w>954</w>
-      <h>24</h>
+      <x>187</x>
+      <y>0</y>
+      <w>1749</w>
+      <h>44</h>
     </coordinates>
     <panel_attributes>SDT 4.0 - Basic Elements
 halign=center
@@ -303,10 +303,10 @@ lw=0.1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>528</x>
-      <y>234</y>
-      <w>150</w>
-      <h>108</h>
+      <x>990</x>
+      <y>143</y>
+      <w>275</w>
+      <h>198</h>
     </coordinates>
     <panel_attributes>ModuleClass
 --
@@ -326,10 +326,10 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>738</x>
-      <y>234</y>
-      <w>132</w>
-      <h>78</h>
+      <x>1375</x>
+      <y>143</y>
+      <w>242</w>
+      <h>143</h>
     </coordinates>
     <panel_attributes>Action
 --
@@ -345,10 +345,10 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>942</x>
-      <y>288</y>
-      <w>102</w>
-      <h>60</h>
+      <x>1749</x>
+      <y>242</y>
+      <w>187</w>
+      <h>110</h>
     </coordinates>
     <panel_attributes>Arg
 --
@@ -362,10 +362,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>864</x>
-      <y>288</y>
-      <w>90</w>
-      <h>24</h>
+      <x>1606</x>
+      <y>242</y>
+      <w>165</w>
+      <h>44</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n</panel_attributes>
@@ -374,10 +374,10 @@ m1= 0..n</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>324</x>
-      <y>234</y>
-      <w>132</w>
-      <h>90</h>
+      <x>616</x>
+      <y>143</y>
+      <w>242</w>
+      <h>165</h>
     </coordinates>
     <panel_attributes>Domain
 --
@@ -394,10 +394,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>234</y>
-      <w>90</w>
-      <h>60</h>
+      <x>847</x>
+      <y>143</y>
+      <w>165</w>
+      <h>110</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n</panel_attributes>
@@ -406,10 +406,10 @@ m1= 0..n</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>324</x>
-      <y>420</y>
-      <w>132</w>
-      <h>66</h>
+      <x>616</x>
+      <y>484</y>
+      <w>242</w>
+      <h>121</h>
     </coordinates>
     <panel_attributes>SubDevice
 --
@@ -424,10 +424,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>288</y>
-      <w>42</w>
-      <h>72</h>
+      <x>847</x>
+      <y>242</y>
+      <w>77</w>
+      <h>132</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n
@@ -437,10 +437,10 @@ m1=0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>420</y>
-      <w>90</w>
-      <h>42</h>
+      <x>847</x>
+      <y>484</y>
+      <w>165</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n</panel_attributes>
@@ -449,10 +449,10 @@ m1= 0..n</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>942</x>
-      <y>456</y>
-      <w>102</w>
-      <h>30</h>
+      <x>1749</x>
+      <y>550</y>
+      <w>187</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>Doc
 --
@@ -462,10 +462,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>672</x>
-      <y>234</y>
-      <w>78</w>
-      <h>42</h>
+      <x>1254</x>
+      <y>143</y>
+      <w>143</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
@@ -475,10 +475,10 @@ m1= 0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>894</x>
-      <y>456</y>
-      <w>60</w>
-      <h>24</h>
+      <x>1661</x>
+      <y>550</y>
+      <w>110</w>
+      <h>44</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..1</panel_attributes>
@@ -487,10 +487,10 @@ m1=0..1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>672</x>
-      <y>270</y>
-      <w>78</w>
-      <h>72</h>
+      <x>1254</x>
+      <y>209</y>
+      <w>143</w>
+      <h>132</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
@@ -500,10 +500,10 @@ m1= 0..n
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>738</x>
-      <y>318</y>
-      <w>132</w>
-      <h>96</h>
+      <x>1375</x>
+      <y>297</y>
+      <w>242</w>
+      <h>176</h>
     </coordinates>
     <panel_attributes>DataPoint
 --
@@ -523,10 +523,10 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>738</x>
-      <y>420</y>
-      <w>132</w>
-      <h>66</h>
+      <x>1375</x>
+      <y>484</y>
+      <w>242</w>
+      <h>121</h>
     </coordinates>
     <panel_attributes>Event
 --
@@ -542,10 +542,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>672</x>
-      <y>330</y>
-      <w>78</w>
-      <h>114</h>
+      <x>1254</x>
+      <y>319</y>
+      <w>143</w>
+      <h>209</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
@@ -555,10 +555,10 @@ m1= 0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>330</y>
-      <w>90</w>
-      <h>144</h>
+      <x>847</x>
+      <y>319</y>
+      <w>165</w>
+      <h>264</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 
@@ -568,10 +568,10 @@ m1= 0..n
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>324</x>
-      <y>336</y>
-      <w>132</w>
-      <h>78</h>
+      <x>616</x>
+      <y>330</y>
+      <w>242</w>
+      <h>143</h>
     </coordinates>
     <panel_attributes>DeviceClass
 --
@@ -587,10 +587,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>390</y>
-      <w>42</w>
-      <h>60</h>
+      <x>847</x>
+      <y>429</y>
+      <w>77</w>
+      <h>110</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n</panel_attributes>
@@ -599,10 +599,10 @@ m1=0..n</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>330</y>
-      <w>90</w>
-      <h>54</h>
+      <x>847</x>
+      <y>319</y>
+      <w>165</w>
+      <h>99</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n</panel_attributes>
@@ -611,10 +611,10 @@ m1= 0..n</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>378</y>
-      <w>90</w>
-      <h>60</h>
+      <x>847</x>
+      <y>407</y>
+      <w>165</w>
+      <h>110</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>
@@ -622,10 +622,10 @@ m1= 0..n</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>528</x>
-      <y>408</y>
-      <w>144</w>
-      <h>78</h>
+      <x>990</x>
+      <y>462</y>
+      <w>264</w>
+      <h>143</h>
     </coordinates>
     <panel_attributes>Property
 --
@@ -642,10 +642,10 @@ transparency=80</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>864</x>
-      <y>306</y>
-      <w>48</w>
-      <h>156</h>
+      <x>1606</x>
+      <y>275</y>
+      <w>88</w>
+      <h>286</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n
@@ -655,10 +655,10 @@ m1=0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>666</x>
-      <y>330</y>
-      <w>42</w>
-      <h>114</h>
+      <x>1243</x>
+      <y>319</y>
+      <w>77</w>
+      <h>209</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n</panel_attributes>
@@ -667,10 +667,10 @@ m1=0..n</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>498</x>
-      <y>816</y>
-      <w>114</w>
-      <h>66</h>
+      <x>935</x>
+      <y>1210</y>
+      <w>209</w>
+      <h>121</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 TypeChoice
@@ -686,10 +686,10 @@ Enum : EnumType
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>426</x>
-      <y>822</y>
-      <w>84</w>
-      <h>48</h>
+      <x>803</x>
+      <y>1221</y>
+      <w>154</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1= 1
@@ -699,10 +699,10 @@ m1= 1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>90</x>
-      <y>348</y>
-      <w>198</w>
-      <h>138</h>
+      <x>187</x>
+      <y>352</y>
+      <w>363</w>
+      <h>253</h>
     </coordinates>
     <panel_attributes>Product
 --
@@ -724,10 +724,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>282</x>
-      <y>342</y>
-      <w>54</w>
-      <h>30</h>
+      <x>539</x>
+      <y>341</y>
+      <w>99</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..1
@@ -737,10 +737,10 @@ m1=0..1
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>198</x>
-      <y>216</y>
-      <w>342</w>
-      <h>144</h>
+      <x>385</x>
+      <y>110</y>
+      <w>627</w>
+      <h>264</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 </panel_attributes>
@@ -749,10 +749,10 @@ m1=0..1
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>198</x>
-      <y>468</y>
-      <w>342</w>
-      <h>54</h>
+      <x>385</x>
+      <y>572</y>
+      <w>627</w>
+      <h>99</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n</panel_attributes>
@@ -761,10 +761,10 @@ m1= 0..n</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>282</x>
-      <y>420</y>
-      <w>54</w>
-      <h>24</h>
+      <x>539</x>
+      <y>484</y>
+      <w>99</w>
+      <h>44</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n</panel_attributes>
@@ -773,10 +773,10 @@ m1=0..n</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>678</x>
-      <y>918</y>
-      <w>114</w>
-      <h>30</h>
+      <x>1265</x>
+      <y>1397</y>
+      <w>209</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>EnumType
 --
@@ -787,10 +787,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>606</x>
-      <y>864</y>
-      <w>84</w>
-      <h>78</h>
+      <x>1133</x>
+      <y>1298</y>
+      <w>154</w>
+      <h>143</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1=0..1
@@ -800,10 +800,10 @@ m1=0..1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>828</x>
-      <y>930</y>
-      <w>126</w>
-      <h>66</h>
+      <x>1540</x>
+      <y>1419</y>
+      <w>231</w>
+      <h>121</h>
     </coordinates>
     <panel_attributes>EnumValue
 --
@@ -818,10 +818,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>786</x>
-      <y>924</y>
-      <w>54</w>
-      <h>30</h>
+      <x>1463</x>
+      <y>1408</y>
+      <w>99</w>
+      <h>55</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1=1..n
@@ -831,10 +831,10 @@ m1=1..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>948</x>
-      <y>936</y>
-      <w>72</w>
-      <h>48</h>
+      <x>1760</x>
+      <y>1430</y>
+      <w>132</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=0..1</panel_attributes>
@@ -843,10 +843,10 @@ m1=0..1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>156</x>
-      <y>534</y>
-      <w>132</w>
-      <h>48</h>
+      <x>308</x>
+      <y>693</y>
+      <w>242</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>Extend
 --
@@ -859,10 +859,10 @@ fg=red</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>528</x>
-      <y>534</y>
-      <w>144</w>
-      <h>42</h>
+      <x>990</x>
+      <y>693</y>
+      <w>264</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>Exclude
 --
@@ -874,23 +874,24 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>534</y>
-      <w>90</w>
-      <h>42</h>
+      <x>847</x>
+      <y>693</y>
+      <w>165</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
-m1= 0..n
-fontsize=12</panel_attributes>
+m1= 1..n
+fontsize=12
+fg=red</panel_attributes>
     <additional_attributes>130.0;10.0;40.0;10.0;40.0;50.0;10.0;50.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>108</x>
-      <y>534</y>
-      <w>60</w>
-      <h>24</h>
+      <x>220</x>
+      <y>693</y>
+      <w>110</w>
+      <h>44</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..1
@@ -900,10 +901,10 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>738</x>
-      <y>528</y>
-      <w>132</w>
-      <h>96</h>
+      <x>1375</x>
+      <y>682</y>
+      <w>242</w>
+      <h>176</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 ExtendType
@@ -921,10 +922,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>666</x>
-      <y>534</y>
-      <w>84</w>
-      <h>42</h>
+      <x>1243</x>
+      <y>693</y>
+      <w>154</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=0..1
@@ -934,10 +935,10 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>528</x>
-      <y>582</y>
-      <w>144</w>
-      <h>42</h>
+      <x>990</x>
+      <y>781</y>
+      <w>264</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>Include
 --
@@ -949,23 +950,24 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>450</x>
-      <y>570</y>
-      <w>90</w>
-      <h>36</h>
+      <x>847</x>
+      <y>759</y>
+      <w>165</w>
+      <h>66</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
-m1= 0..n
-fontsize=12</panel_attributes>
+m1= 1..n
+fontsize=12
+fg=red</panel_attributes>
     <additional_attributes>130.0;30.0;40.0;30.0;40.0;10.0;10.0;10.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>666</x>
-      <y>534</y>
-      <w>84</w>
-      <h>90</h>
+      <x>1243</x>
+      <y>693</y>
+      <w>154</w>
+      <h>165</h>
     </coordinates>
     <panel_attributes>lt=-
 
@@ -975,10 +977,10 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>342</x>
-      <y>534</y>
-      <w>114</w>
-      <h>48</h>
+      <x>649</x>
+      <y>693</y>
+      <w>209</w>
+      <h>88</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 ExtendChoice
@@ -993,10 +995,10 @@ Includes : Include
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>282</x>
-      <y>540</y>
-      <w>72</w>
-      <h>42</h>
+      <x>539</x>
+      <y>704</y>
+      <w>132</w>
+      <h>77</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=0..1
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 26485184b9204af776ba87046dad5460d5bb9bf1..d1bacae05022b6d70b137b1ff4ef3d42ceee2d8a 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