diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf
index 5bc1cf3492bc8ea923a5ba8fe053aaa3e6111cfb..e004e4e2ad8c58f03b75d97cb332b98656f559c2 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>7</zoom_level>
+  <zoom_level>6</zoom_level>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>105</x>
-      <y>623</y>
-      <w>217</w>
-      <h>182</h>
+      <x>72</x>
+      <y>636</y>
+      <w>186</w>
+      <h>156</h>
     </coordinates>
     <panel_attributes>bg=#FAF8C8
 fontsize=12
@@ -36,10 +36,10 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>196</x>
-      <y>693</y>
-      <w>77</w>
-      <h>28</h>
+      <x>150</x>
+      <y>696</y>
+      <w>66</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 fontsize=10
@@ -51,10 +51,10 @@ group=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>196</x>
-      <y>721</y>
-      <w>77</w>
-      <h>21</h>
+      <x>150</x>
+      <y>720</y>
+      <w>66</w>
+      <h>18</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 fontsize=10
@@ -64,10 +64,10 @@ group=1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1162</x>
-      <y>826</y>
-      <w>105</w>
-      <h>154</h>
+      <x>978</x>
+      <y>810</y>
+      <w>90</w>
+      <h>132</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 BasicType
@@ -88,10 +88,10 @@ void</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>728</x>
-      <y>882</y>
-      <w>98</w>
-      <h>56</h>
+      <x>606</x>
+      <y>858</y>
+      <w>84</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1= 0..1
@@ -101,10 +101,10 @@ m1= 0..1
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>728</x>
-      <y>826</y>
-      <w>98</w>
-      <h>56</h>
+      <x>606</x>
+      <y>810</y>
+      <w>84</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1=0..1
@@ -114,10 +114,10 @@ m1=0..1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>392</x>
-      <y>826</y>
-      <w>133</w>
-      <h>105</h>
+      <x>318</x>
+      <y>810</y>
+      <w>114</w>
+      <h>90</h>
     </coordinates>
     <panel_attributes>DataType
 --
@@ -134,10 +134,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>497</x>
-      <y>784</y>
-      <w>497</w>
-      <h>91</h>
+      <x>408</x>
+      <y>774</y>
+      <w>426</w>
+      <h>78</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m2=1..n
@@ -147,10 +147,10 @@ m2=1..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>497</x>
-      <y>784</y>
-      <w>497</w>
-      <h>133</h>
+      <x>408</x>
+      <y>774</y>
+      <w>426</w>
+      <h>114</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m2=1
@@ -160,10 +160,10 @@ m2=1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>812</x>
-      <y>910</y>
-      <w>133</w>
-      <h>35</h>
+      <x>678</x>
+      <y>882</y>
+      <w>114</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>SimpleType
 --
@@ -174,10 +174,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>938</x>
-      <y>924</y>
-      <w>238</w>
-      <h>35</h>
+      <x>786</x>
+      <y>894</y>
+      <w>204</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1= 1
@@ -187,10 +187,10 @@ m1= 1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>812</x>
-      <y>994</y>
-      <w>133</w>
-      <h>77</h>
+      <x>678</x>
+      <y>954</y>
+      <w>114</w>
+      <h>66</h>
     </coordinates>
     <panel_attributes>Constraint
 --
@@ -205,10 +205,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>518</x>
-      <y>896</y>
-      <w>308</w>
-      <h>126</h>
+      <x>426</x>
+      <y>870</y>
+      <w>264</w>
+      <h>108</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n
@@ -218,10 +218,10 @@ m1=0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>938</x>
-      <y>973</y>
-      <w>294</w>
-      <h>98</h>
+      <x>786</x>
+      <y>936</y>
+      <w>252</w>
+      <h>84</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=1
@@ -231,10 +231,10 @@ m1=1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>812</x>
-      <y>826</y>
-      <w>133</w>
-      <h>35</h>
+      <x>678</x>
+      <y>810</y>
+      <w>114</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>StructType
 --
@@ -245,10 +245,10 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>812</x>
-      <y>868</y>
-      <w>133</w>
-      <h>35</h>
+      <x>678</x>
+      <y>846</y>
+      <w>114</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>ArrayType
 --
@@ -259,10 +259,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>728</x>
-      <y>861</y>
-      <w>98</w>
-      <h>35</h>
+      <x>606</x>
+      <y>840</y>
+      <w>84</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1= 0..1
@@ -273,10 +273,10 @@ m1= 0..1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>392</x>
-      <y>728</y>
-      <w>875</w>
-      <h>28</h>
+      <x>318</x>
+      <y>726</y>
+      <w>750</w>
+      <h>24</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>126</x>
-      <y>63</y>
-      <w>1113</w>
-      <h>28</h>
+      <x>90</x>
+      <y>156</y>
+      <w>954</w>
+      <h>24</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>637</x>
-      <y>154</y>
-      <w>175</w>
-      <h>126</h>
+      <x>528</x>
+      <y>234</y>
+      <w>150</w>
+      <h>108</h>
     </coordinates>
     <panel_attributes>ModuleClass
 --
@@ -326,10 +326,10 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>882</x>
-      <y>154</y>
-      <w>154</w>
-      <h>91</h>
+      <x>738</x>
+      <y>234</y>
+      <w>132</w>
+      <h>78</h>
     </coordinates>
     <panel_attributes>Action
 --
@@ -345,10 +345,10 @@ fg=blue</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1120</x>
-      <y>217</y>
-      <w>119</w>
-      <h>70</h>
+      <x>942</x>
+      <y>288</y>
+      <w>102</w>
+      <h>60</h>
     </coordinates>
     <panel_attributes>Arg
 --
@@ -362,10 +362,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1029</x>
-      <y>217</y>
-      <w>105</w>
-      <h>28</h>
+      <x>864</x>
+      <y>288</y>
+      <w>90</w>
+      <h>24</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>399</x>
-      <y>154</y>
-      <w>154</w>
-      <h>105</h>
+      <x>324</x>
+      <y>234</y>
+      <w>132</w>
+      <h>90</h>
     </coordinates>
     <panel_attributes>Domain
 --
@@ -394,10 +394,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>546</x>
-      <y>154</y>
-      <w>105</w>
-      <h>70</h>
+      <x>450</x>
+      <y>234</y>
+      <w>90</w>
+      <h>60</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>399</x>
-      <y>371</y>
-      <w>154</w>
-      <h>77</h>
+      <x>324</x>
+      <y>420</y>
+      <w>132</w>
+      <h>66</h>
     </coordinates>
     <panel_attributes>SubDevice
 --
@@ -424,10 +424,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>546</x>
-      <y>217</y>
-      <w>49</w>
-      <h>84</h>
+      <x>450</x>
+      <y>288</y>
+      <w>42</w>
+      <h>72</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n
@@ -437,10 +437,10 @@ m1=0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>546</x>
-      <y>371</y>
-      <w>105</w>
-      <h>49</h>
+      <x>450</x>
+      <y>420</y>
+      <w>90</w>
+      <h>42</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>1120</x>
-      <y>413</y>
-      <w>119</w>
-      <h>35</h>
+      <x>942</x>
+      <y>456</y>
+      <w>102</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>Doc
 --
@@ -462,10 +462,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>805</x>
-      <y>154</y>
-      <w>91</w>
-      <h>49</h>
+      <x>672</x>
+      <y>234</y>
+      <w>78</w>
+      <h>42</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
@@ -475,10 +475,10 @@ m1= 0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1064</x>
-      <y>413</y>
-      <w>70</w>
-      <h>28</h>
+      <x>894</x>
+      <y>456</y>
+      <w>60</w>
+      <h>24</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>805</x>
-      <y>196</y>
-      <w>91</w>
-      <h>84</h>
+      <x>672</x>
+      <y>270</y>
+      <w>78</w>
+      <h>72</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
@@ -500,10 +500,10 @@ m1= 0..n
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>882</x>
-      <y>252</y>
-      <w>154</w>
-      <h>112</h>
+      <x>738</x>
+      <y>318</y>
+      <w>132</w>
+      <h>96</h>
     </coordinates>
     <panel_attributes>DataPoint
 --
@@ -523,10 +523,10 @@ fg=blue
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>882</x>
-      <y>371</y>
-      <w>154</w>
-      <h>77</h>
+      <x>738</x>
+      <y>420</y>
+      <w>132</w>
+      <h>66</h>
     </coordinates>
     <panel_attributes>Event
 --
@@ -542,10 +542,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>805</x>
-      <y>266</y>
-      <w>91</w>
-      <h>133</h>
+      <x>672</x>
+      <y>330</y>
+      <w>78</w>
+      <h>114</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
@@ -555,10 +555,10 @@ m1= 0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>546</x>
-      <y>266</y>
-      <w>105</w>
-      <h>168</h>
+      <x>450</x>
+      <y>330</y>
+      <w>90</w>
+      <h>144</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 
@@ -568,10 +568,10 @@ m1= 0..n
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>399</x>
-      <y>273</y>
-      <w>154</w>
-      <h>91</h>
+      <x>324</x>
+      <y>336</y>
+      <w>132</w>
+      <h>78</h>
     </coordinates>
     <panel_attributes>DeviceClass
 --
@@ -587,10 +587,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>546</x>
-      <y>336</y>
-      <w>49</w>
-      <h>70</h>
+      <x>450</x>
+      <y>390</y>
+      <w>42</w>
+      <h>60</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>546</x>
-      <y>266</y>
-      <w>105</w>
-      <h>63</h>
+      <x>450</x>
+      <y>330</y>
+      <w>90</w>
+      <h>54</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>546</x>
-      <y>322</y>
-      <w>105</w>
-      <h>70</h>
+      <x>450</x>
+      <y>378</y>
+      <w>90</w>
+      <h>60</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>637</x>
-      <y>357</y>
-      <w>168</w>
-      <h>91</h>
+      <x>528</x>
+      <y>408</y>
+      <w>144</w>
+      <h>78</h>
     </coordinates>
     <panel_attributes>Property
 --
@@ -642,10 +642,10 @@ transparency=80</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1029</x>
-      <y>238</y>
-      <w>56</w>
-      <h>182</h>
+      <x>864</x>
+      <y>306</y>
+      <w>48</w>
+      <h>156</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n
@@ -655,10 +655,10 @@ m1=0..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>798</x>
-      <y>266</y>
-      <w>49</w>
-      <h>133</h>
+      <x>666</x>
+      <y>330</y>
+      <w>42</w>
+      <h>114</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>602</x>
-      <y>833</y>
-      <w>133</w>
-      <h>77</h>
+      <x>498</x>
+      <y>816</y>
+      <w>114</w>
+      <h>66</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 TypeChoice
@@ -686,10 +686,10 @@ Enum : EnumType
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>518</x>
-      <y>840</y>
-      <w>98</w>
-      <h>56</h>
+      <x>426</x>
+      <y>822</y>
+      <w>84</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1= 1
@@ -699,10 +699,10 @@ m1= 1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>126</x>
-      <y>287</y>
-      <w>231</w>
-      <h>161</h>
+      <x>90</x>
+      <y>348</y>
+      <w>198</w>
+      <h>138</h>
     </coordinates>
     <panel_attributes>Product
 --
@@ -724,10 +724,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>350</x>
-      <y>280</y>
-      <w>63</w>
-      <h>35</h>
+      <x>282</x>
+      <y>342</y>
+      <w>54</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..1
@@ -737,10 +737,10 @@ m1=0..1
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>252</x>
-      <y>133</y>
-      <w>399</w>
-      <h>168</h>
+      <x>198</x>
+      <y>216</y>
+      <w>342</w>
+      <h>144</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 </panel_attributes>
@@ -749,10 +749,10 @@ m1=0..1
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>252</x>
-      <y>427</y>
-      <w>399</w>
-      <h>63</h>
+      <x>198</x>
+      <y>468</y>
+      <w>342</w>
+      <h>54</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>350</x>
-      <y>371</y>
-      <w>63</w>
-      <h>28</h>
+      <x>282</x>
+      <y>420</y>
+      <w>54</w>
+      <h>24</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>812</x>
-      <y>952</y>
-      <w>133</w>
-      <h>35</h>
+      <x>678</x>
+      <y>918</y>
+      <w>114</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>EnumType
 --
@@ -787,10 +787,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>728</x>
-      <y>889</y>
-      <w>98</w>
-      <h>91</h>
+      <x>606</x>
+      <y>864</y>
+      <w>84</w>
+      <h>78</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1=0..1
@@ -800,10 +800,10 @@ m1=0..1
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>987</x>
-      <y>966</y>
-      <w>147</w>
-      <h>77</h>
+      <x>828</x>
+      <y>930</y>
+      <w>126</w>
+      <h>66</h>
     </coordinates>
     <panel_attributes>EnumValue
 --
@@ -818,10 +818,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>938</x>
-      <y>959</y>
-      <w>63</w>
-      <h>35</h>
+      <x>786</x>
+      <y>924</y>
+      <w>54</w>
+      <h>30</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;.
 m1=1..n
@@ -831,10 +831,10 @@ m1=1..n
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1127</x>
-      <y>973</y>
-      <w>84</w>
-      <h>56</h>
+      <x>948</x>
+      <y>936</y>
+      <w>72</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=0..1</panel_attributes>
@@ -843,26 +843,26 @@ m1=0..1</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>231</x>
-      <y>504</y>
-      <w>154</w>
-      <h>56</h>
+      <x>156</x>
+      <y>534</y>
+      <w>132</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>Extend
 --
 *@domain : IDRF*
 *@entity : ID*
-- ExtendChoice
-fg=blue</panel_attributes>
+/- ExtendChoice/
+fg=red</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>637</x>
-      <y>504</y>
-      <w>168</w>
-      <h>49</h>
+      <x>528</x>
+      <y>534</y>
+      <w>144</w>
+      <h>42</h>
     </coordinates>
     <panel_attributes>Exclude
 --
@@ -874,23 +874,23 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>553</x>
-      <y>504</y>
-      <w>98</w>
-      <h>49</h>
+      <x>450</x>
+      <y>534</y>
+      <w>90</w>
+      <h>42</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
 fontsize=12</panel_attributes>
-    <additional_attributes>120.0;10.0;30.0;10.0;30.0;50.0;10.0;50.0</additional_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>175</x>
-      <y>504</y>
-      <w>70</w>
-      <h>28</h>
+      <x>108</x>
+      <y>534</y>
+      <w>60</w>
+      <h>24</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..1
@@ -900,10 +900,10 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>882</x>
-      <y>497</y>
-      <w>154</w>
-      <h>112</h>
+      <x>738</x>
+      <y>528</y>
+      <w>132</w>
+      <h>96</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 ExtendType
@@ -921,10 +921,10 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>798</x>
-      <y>504</y>
-      <w>98</w>
-      <h>49</h>
+      <x>666</x>
+      <y>534</y>
+      <w>84</w>
+      <h>42</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
 m1=0..1
@@ -934,10 +934,10 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>637</x>
-      <y>560</y>
-      <w>168</w>
-      <h>49</h>
+      <x>528</x>
+      <y>582</y>
+      <w>144</w>
+      <h>42</h>
     </coordinates>
     <panel_attributes>Include
 --
@@ -949,23 +949,23 @@ fg=blue</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>553</x>
-      <y>546</y>
-      <w>98</w>
-      <h>42</h>
+      <x>450</x>
+      <y>570</y>
+      <w>90</w>
+      <h>36</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1= 0..n
 fontsize=12</panel_attributes>
-    <additional_attributes>120.0;30.0;30.0;30.0;30.0;10.0;10.0;10.0</additional_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>798</x>
-      <y>504</y>
-      <w>98</w>
-      <h>105</h>
+      <x>666</x>
+      <y>534</y>
+      <w>84</w>
+      <h>90</h>
     </coordinates>
     <panel_attributes>lt=-
 
@@ -975,10 +975,10 @@ fontsize=12</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>427</x>
-      <y>504</y>
-      <w>133</w>
-      <h>56</h>
+      <x>342</x>
+      <y>534</y>
+      <w>114</w>
+      <h>48</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 ExtendChoice
@@ -993,14 +993,15 @@ Includes : Include
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>378</x>
-      <y>511</y>
-      <w>63</w>
-      <h>49</h>
+      <x>282</x>
+      <y>540</y>
+      <w>72</w>
+      <h>42</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;-
-m1= 1
-fontsize=12</panel_attributes>
-    <additional_attributes>70.0;10.0;30.0;10.0;30.0;50.0;10.0;50.0</additional_attributes>
+m1=0..1
+fontsize=12
+fg=red</panel_attributes>
+    <additional_attributes>100.0;10.0;50.0;10.0;50.0;50.0;10.0;50.0</additional_attributes>
   </element>
 </diagram>
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 7efa3323ffa4f1af001a4f7f5064337adbb5311e..26485184b9204af776ba87046dad5460d5bb9bf1 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