diff --git a/src/main/resources/diagrams/spring-petclinic-with-vademecum.uxf b/src/main/resources/diagrams/spring-petclinic-with-vademecum.uxf
index b6ae14310c2..2bf65cd732d 100644
--- a/src/main/resources/diagrams/spring-petclinic-with-vademecum.uxf
+++ b/src/main/resources/diagrams/spring-petclinic-with-vademecum.uxf
@@ -29,13 +29,13 @@
     <id>UMLClass</id>
     <coordinates>
       <x>620</x>
-      <y>250</y>
+      <y>100</y>
       <w>280</w>
       <h>70</h>
     </coordinates>
     <panel_attributes>Pet
 --
-birthDate: LocalDate {Date}
+birthDate: Date {Past}
 </panel_attributes>
     <additional_attributes/>
   </element>
@@ -43,7 +43,7 @@ birthDate: LocalDate {Date}
     <id>UMLClass</id>
     <coordinates>
       <x>100</x>
-      <y>500</y>
+      <y>350</y>
       <w>100</w>
       <h>40</h>
     </coordinates>
@@ -54,7 +54,7 @@ birthDate: LocalDate {Date}
     <id>Relation</id>
     <coordinates>
       <x>700</x>
-      <y>210</y>
+      <y>60</y>
       <w>30</w>
       <h>60</h>
     </coordinates>
@@ -65,14 +65,13 @@ birthDate: LocalDate {Date}
     <id>UMLClass</id>
     <coordinates>
       <x>650</x>
-      <y>160</y>
-      <w>130</w>
-      <h>60</h>
+      <y>20</y>
+      <w>190</w>
+      <h>50</h>
     </coordinates>
     <panel_attributes>NamedEntity
 --
-name: String
-
+name: String {NotEmpty}
 </panel_attributes>
     <additional_attributes/>
   </element>
@@ -80,21 +79,21 @@ name: String
     <id>UMLClass</id>
     <coordinates>
       <x>250</x>
-      <y>250</y>
+      <y>100</y>
       <w>230</w>
       <h>90</h>
     </coordinates>
     <panel_attributes>Visit
 --
-date: LocalDate {Date}
-description: String</panel_attributes>
+date: Date 
+description: String {NotEmpty}</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
       <x>860</x>
-      <y>360</y>
+      <y>210</y>
       <w>120</w>
       <h>40</h>
     </coordinates>
@@ -106,21 +105,21 @@ description: String</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>470</x>
-      <y>270</y>
+      <y>130</y>
       <w>170</w>
-      <h>60</h>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=-
 m1=1
 m2=0..n
 </panel_attributes>
-    <additional_attributes>150.0;30.0;10.0;30.0</additional_attributes>
+    <additional_attributes>150.0;20.0;10.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
       <x>700</x>
-      <y>210</y>
+      <y>60</y>
       <w>380</w>
       <h>270</h>
     </coordinates>
@@ -131,7 +130,7 @@ m2=0..n
     <id>Relation</id>
     <coordinates>
       <x>770</x>
-      <y>310</y>
+      <y>160</y>
       <w>110</w>
       <h>90</h>
     </coordinates>
@@ -142,20 +141,20 @@ m2=0..n
     <id>UMLClass</id>
     <coordinates>
       <x>1010</x>
-      <y>460</y>
+      <y>310</y>
       <w>180</w>
       <h>90</h>
     </coordinates>
     <panel_attributes>Disease
 --
-description: String</panel_attributes>
+description: String {NotEmpty}</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
       <x>700</x>
-      <y>210</y>
+      <y>60</y>
       <w>270</w>
       <h>170</h>
     </coordinates>
@@ -166,7 +165,7 @@ description: String</panel_attributes>
     <id>UMLClass</id>
     <coordinates>
       <x>1190</x>
-      <y>580</y>
+      <y>430</y>
       <w>100</w>
       <h>50</h>
     </coordinates>
@@ -178,7 +177,7 @@ description: String</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>700</x>
-      <y>210</y>
+      <y>60</y>
       <w>530</w>
       <h>390</h>
     </coordinates>
@@ -189,7 +188,7 @@ description: String</panel_attributes>
     <id>UMLClass</id>
     <coordinates>
       <x>350</x>
-      <y>480</y>
+      <y>330</y>
       <w>190</w>
       <h>60</h>
     </coordinates>
@@ -202,21 +201,22 @@ description: String</panel_attributes>
     <id>UMLClass</id>
     <coordinates>
       <x>390</x>
-      <y>620</y>
+      <y>470</y>
       <w>260</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>Treatment
 --
-description: String
-dose: Integer</panel_attributes>
+description: String {NotEmpty}
+dose: Integer {Min(1)}
+periodicity: String</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
       <x>1250</x>
-      <y>670</y>
+      <y>520</y>
       <w>100</w>
       <h>40</h>
     </coordinates>
@@ -227,7 +227,7 @@ dose: Integer</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>700</x>
-      <y>210</y>
+      <y>60</y>
       <w>640</w>
       <h>480</h>
     </coordinates>
@@ -238,8 +238,8 @@ dose: Integer</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>370</x>
-      <y>330</y>
-      <w>60</w>
+      <y>180</y>
+      <w>50</w>
       <h>170</h>
     </coordinates>
     <panel_attributes>lt=-&gt;
@@ -251,22 +251,22 @@ m2=1</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>190</x>
-      <y>490</y>
+      <y>350</y>
       <w>180</w>
-      <h>60</h>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=1
 m2=0..n
 </panel_attributes>
-    <additional_attributes>10.0;30.0;160.0;30.0</additional_attributes>
+    <additional_attributes>10.0;20.0;160.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
       <x>400</x>
-      <y>530</y>
-      <w>60</w>
+      <y>380</y>
+      <w>50</w>
       <h>110</h>
     </coordinates>
     <panel_attributes>lt=-
@@ -279,35 +279,35 @@ m2=0..n
     <id>Relation</id>
     <coordinates>
       <x>640</x>
-      <y>660</y>
+      <y>520</y>
       <w>630</w>
-      <h>60</h>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=-
 m1=0..n
 m2=0..1
 </panel_attributes>
-    <additional_attributes>10.0;30.0;610.0;30.0</additional_attributes>
+    <additional_attributes>10.0;20.0;610.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
       <x>530</x>
-      <y>480</y>
+      <y>340</y>
       <w>500</w>
-      <h>60</h>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=&lt;-
 m1=1
 m2=0..n
 </panel_attributes>
-    <additional_attributes>480.0;30.0;10.0;30.0</additional_attributes>
+    <additional_attributes>480.0;20.0;10.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
       <x>1070</x>
-      <y>540</y>
+      <y>390</y>
       <w>140</w>
       <h>100</h>
     </coordinates>
@@ -320,22 +320,22 @@ m2=1..n
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>760</x>
-      <y>580</y>
-      <w>200</w>
+      <x>750</x>
+      <y>430</y>
+      <w>210</w>
       <h>80</h>
     </coordinates>
     <panel_attributes>Prevalence
 --
-percentage: int
-usualSeverity: String</panel_attributes>
+percentage: int {Min(0),Max(100)}
+usualSeverity: String {NotEmpty}</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
       <x>950</x>
-      <y>590</y>
+      <y>440</y>
       <w>150</w>
       <h>60</h>
     </coordinates>
@@ -347,7 +347,7 @@ usualSeverity: String</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>870</x>
-      <y>390</y>
+      <y>240</y>
       <w>160</w>
       <h>120</h>
     </coordinates>
@@ -361,7 +361,7 @@ develops</panel_attributes>
     <id>UMLNote</id>
     <coordinates>
       <x>0</x>
-      <y>720</y>
+      <y>570</y>
       <w>490</w>
       <h>80</h>
     </coordinates>
@@ -375,7 +375,7 @@ is compatible with the type of pet of its related visit</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>190</x>
-      <y>530</y>
+      <y>380</y>
       <w>210</w>
       <h>210</h>
     </coordinates>
@@ -387,7 +387,7 @@ fg=red</panel_attributes>
     <id>UMLClass</id>
     <coordinates>
       <x>1470</x>
-      <y>660</y>
+      <y>510</y>
       <w>140</w>
       <h>50</h>
     </coordinates>
@@ -398,7 +398,7 @@ fg=red</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>700</x>
-      <y>210</y>
+      <y>60</y>
       <w>840</w>
       <h>470</h>
     </coordinates>
@@ -409,22 +409,22 @@ fg=red</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>1340</x>
-      <y>660</y>
+      <y>520</y>
       <w>150</w>
-      <h>60</h>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=-&gt;
 m1=0..n
 m2=1
 contains</panel_attributes>
-    <additional_attributes>10.0;30.0;130.0;30.0</additional_attributes>
+    <additional_attributes>10.0;20.0;130.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
       <x>1540</x>
-      <y>670</y>
-      <w>270</w>
+      <y>520</y>
+      <w>240</w>
       <h>110</h>
     </coordinates>
     <panel_attributes>lt=-
@@ -438,7 +438,7 @@ with</panel_attributes>
     <id>UMLNote</id>
     <coordinates>
       <x>540</x>
-      <y>730</y>
+      <y>580</y>
       <w>640</w>
       <h>80</h>
     </coordinates>
@@ -452,7 +452,7 @@ contain incompatible active principles</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>510</x>
-      <y>690</y>
+      <y>540</y>
       <w>140</w>
       <h>60</h>
     </coordinates>