Se agrega 'Consultar solicitante'. Falta especificar

[z.facultad/75.10/miklolife.git] / diagramas / clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 38d1ef8d4bbcf71a6e442aa2d9edba3de4c0fa75..ab5095969ec0cc96858d64ea211822a9bff74587 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -25,10 +25,10 @@
           <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="is_portrait">
           <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="is_portrait">

-          <dia:boolean val="true"/>
+          <dia:boolean val="false"/>

         </dia:attribute>
         <dia:attribute name="scaling">
         </dia:attribute>
         <dia:attribute name="scaling">

-          <dia:real val="0.38388997316360474"/>
+          <dia:real val="0.38150566816329956"/>

         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>


@@ -71,19 +71,19 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - Class" version="0" id="O0">
       <dia:attribute name="obj_pos">

-        <dia:point val="20.35,17.3"/>
+        <dia:point val="34.05,25.1"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.3,17.25;26.25,20.55"/>
+        <dia:rectangle val="34,25.05;38.6,26.95"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="20.35,17.3"/>
+        <dia:point val="34.05,25.1"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="4.5"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="1.7999999999999998"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Promotor#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Promotor#</dia:string>


@@ -92,7 +92,7 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Persona encargada de atender a los Solicitantes que quieren afiliarse.#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -163,54 +163,7 @@
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>

-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#cap#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#disponibilidad#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
+      <dia:attribute name="attributes"/>

       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>


@@ -219,19 +172,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">

-        <dia:point val="20,1.8"/>
+        <dia:point val="33.3,8.95"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="19.95,1.75;26.55,13.05"/>
+        <dia:rectangle val="33.25,8.9;45.85,16.2"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="20,1.8"/>
+        <dia:point val="33.3,8.95"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="6.5"/>
+        <dia:real val="12.5"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="11.200000000000001"/>
+        <dia:real val="7.1999999999999993"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Persona#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Persona#</dia:string>


@@ -240,10 +193,10 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Clase abstracta para representar los datos y acciones comunes de una persona.#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
       </dia:attribute>
       <dia:attribute name="abstract">

-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>

       </dia:attribute>
       <dia:attribute name="suppress_attributes">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_attributes">
         <dia:boolean val="false"/>


@@ -314,16 +267,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#tipodoc#</dia:string>
+            <dia:string>#tipoDocumento#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#enum(DNI,LC,LE,CI)#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Tipo de documento.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -337,16 +290,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#nrodoc#</dia:string>
+            <dia:string>#nroDocumento#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Número de documento#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -363,13 +316,13 @@
             <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#nombre#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Primer y segundo nombre (en ese orden).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -386,13 +339,13 @@
             <dia:string>#apellido#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#apellido#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Apellido completo.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -406,16 +359,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#telefono#</dia:string>
+            <dia:string>#eMail#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Dirección de correo electrónico de la persona.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -429,16 +382,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#calle#</dia:string>
+            <dia:string>#fechaNacimiento#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -452,16 +405,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#numero#</dia:string>
+            <dia:string>#sexo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#enum(M,F)#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Género de la persona#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -473,18 +426,120 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O2">
+      <dia:attribute name="obj_pos">
+        <dia:point val="21.6,23.05"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="21.55,23;30.65,28.7"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="21.6,23.05"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="9"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="5.5999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Afiliado#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>#Persona afiliada a la obra social.#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">

         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#deaprtamento#</dia:string>
+            <dia:string>#nroAfiliado#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único de afiliado (con alguna codificación? int?).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -498,16 +553,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#codigo_postal#</dia:string>
+            <dia:string>#fecha_afiliacion#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que se lo dio de alta en el sistema.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -521,16 +576,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#provincia#</dia:string>
+            <dia:string>#fecha_baja#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que el afiliado solicita la baja#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -544,16 +599,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#e_mail#</dia:string>
+            <dia:string>#activo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#bool#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#True si está en actividad (afiliado). (No convendría poner Plan = NULL en caso de no estar más afiliado?)#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -567,16 +622,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha_nacimiento#</dia:string>
+            <dia:string>#moroso#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Indica cuantos meses adeuda.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -595,30 +650,30 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O2">
+    <dia:object type="UML - Class" version="0" id="O3">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="12.8,17.3"/>
+        <dia:point val="-4.825,13.05"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="12.75,17.25;19.4,22.15"/>
+        <dia:rectangle val="-4.875,13;1.075,16.3"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="12.8,17.3"/>
+        <dia:point val="-4.825,13.05"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="6.5499999999999998"/>
+        <dia:real val="5.8499999999999996"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Afiliado#</dia:string>
+        <dia:string>#Prestacion#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Tipo de prestación que puede realizarse un afiliado.#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -692,62 +747,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#num_afiliado#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha_afiliacion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#plan#</dia:string>
+            <dia:string>#nombre#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Nombre de la prestación (descripción breve).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -761,16 +770,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#titular#</dia:string>
+            <dia:string>#codigo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -789,24 +798,24 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O3">
+    <dia:object type="UML - Class" version="0" id="O4">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="-3.925,11.6"/>
+        <dia:point val="11.375,26.1"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-3.975,11.55;1.075,16.45"/>
+        <dia:rectangle val="11.325,26.05;18.675,30.95"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="-3.925,11.6"/>
+        <dia:point val="11.375,26.1"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="4.9499999999999993"/>
+        <dia:real val="7.25"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Prestacion#</dia:string>
+        <dia:string>#Plan#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>


@@ -821,7 +830,7 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">

-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>

       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>


@@ -886,7 +895,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#nombre#</dia:string>
+            <dia:string>#codigo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>


@@ -909,7 +918,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#codigo#</dia:string>
+            <dia:string>#precio#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>


@@ -932,7 +941,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#cobertura#</dia:string>
+            <dia:string>#descripcion#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>


@@ -955,7 +964,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#costo#</dia:string>
+            <dia:string>#permanencia_minima#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>##</dia:string>


@@ -983,30 +992,30 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O4">
+    <dia:object type="UML - Class" version="0" id="O5">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="7.475,26.55"/>
+        <dia:point val="-4,2.75"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="7.425,26.5;14.625,32.2"/>
+        <dia:rectangle val="-4.05,2.7;1.9,6.8"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="7.475,26.55"/>
+        <dia:point val="-4,2.75"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="5.8499999999999996"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="4"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Plan#</dia:string>
+        <dia:string>#Prestador#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Entidad prestadora de servicios para la obra social. Podría ser tanto una Clínica, como un centro de radiología o un médico particular.#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -1015,7 +1024,7 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">

-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>

       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>


@@ -1083,13 +1092,13 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1103,16 +1112,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#precio#</dia:string>
+            <dia:string>#nombre#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Nombre legal de la entidad.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1126,16 +1135,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#descripcion#</dia:string>
+            <dia:string>#cuit#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1147,18 +1156,120 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O6">
+      <dia:attribute name="obj_pos">
+        <dia:point val="32.375,0.1"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="32.325,0.05;40.025,3.35"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="32.375,0.1"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="7.5999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Cap#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>#Centro de Atención Personalizada, es un punto de atención al cliente que cubre una o más Zonas y tiene uno o más Promotores.#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">

         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha_de_inicio#</dia:string>
+            <dia:string>#responsable#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Nombre del responsable (gerente) del CAP (lo usamos para algo!?!?!?!!).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1172,16 +1283,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#horario#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1200,30 +1311,30 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O5">
+    <dia:object type="UML - Class" version="0" id="O7">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="-3.75,1.05"/>
+        <dia:point val="5.775,4.65"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-3.8,1;0.95,6.7"/>
+        <dia:rectangle val="5.725,4.6;17.275,15.3"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="-3.75,1.05"/>
+        <dia:point val="5.775,4.65"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="4.6499999999999995"/>
+        <dia:real val="11.449999999999999"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="10.6"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Prestador#</dia:string>
+        <dia:string>#Autorizacion#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Cada vez que un Afiliado va a realizarse una Prestación, debe pedir una Autorización (sea Manual o Automática0.#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -1238,7 +1349,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">

-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>

       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>


@@ -1297,16 +1408,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#direccion#</dia:string>
+            <dia:string>#codigo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Identificador único.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1320,16 +1431,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#zona#</dia:string>
+            <dia:string>#tipo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Tipo de autorización. (esto si tenemos subclases no debería existir)#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1343,16 +1454,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#codigo#</dia:string>
+            <dia:string>#fechaSolicitud#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que fue solicitada la autorización.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1366,16 +1477,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#nombre#</dia:string>
+            <dia:string>#fechaResolucion#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que se aprobó la autorización.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1389,10 +1500,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#cuit#</dia:string>
+            <dia:string>#fechaVencimiento#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -1410,114 +1521,12 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

-      </dia:attribute>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O6">
-      <dia:attribute name="obj_pos">
-        <dia:point val="20.875,25.35"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.825,25.3;25.725,31"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="20.875,25.35"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="4.7999999999999998"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Cap#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">

         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#zona#</dia:string>
+            <dia:string>#porcentajeCobertura#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -1537,16 +1546,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#telefono#</dia:string>
+            <dia:string>#observaciones#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Observaciones sobre la autorización (debería ir sólo en Manual o no?)#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1560,10 +1569,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#responsable#</dia:string>
+            <dia:string>#fundamentos_resolucion#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -1583,10 +1592,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#direccion#</dia:string>
+            <dia:string>#fecha_realizacion#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -1606,10 +1615,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#horario#</dia:string>
+            <dia:string>#fecha_vencimiento#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -1628,36 +1637,137 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>

-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#get_estado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>

     </dia:object>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O7">
+    <dia:object type="UML - Generalization" version="0" id="O8">
+      <dia:attribute name="obj_pos">
+        <dia:point val="39.5,16.15"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="26.05,16.1;40.35,23.52"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="39.5,16.15"/>
+        <dia:point val="39.5,22.72"/>
+        <dia:point val="26.1,22.72"/>
+        <dia:point val="26.1,23.05"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O2" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Generalization" version="0" id="O9">
+      <dia:attribute name="obj_pos">
+        <dia:point val="39.5,16.15"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="36.25,16.1;40.35,25.15"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="39.5,16.15"/>
+        <dia:point val="39.5,22.72"/>
+        <dia:point val="36.3,22.72"/>
+        <dia:point val="36.3,25.1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="6"/>
+        <dia:connection handle="1" to="O0" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O10">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="6.175,5.5"/>
+        <dia:point val="44.115,-2.04"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="6.125,5.45;12.775,13.55"/>
+        <dia:rectangle val="44.065,-2.09;51.765,1.21"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="6.175,5.5"/>
+        <dia:point val="44.115,-2.04"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="6.5499999999999998"/>
+        <dia:real val="7.5999999999999996"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="8"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Autorizacion#</dia:string>
+        <dia:string>#Zona#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Región geográfica, cuya mínima unidad es un barrio.#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -1734,59 +1844,13 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#tipo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha_emision#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#País en donde se encuentra.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1800,10 +1864,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha_aprobacion#</dia:string>
+            <dia:string>#descripcion#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -1821,18 +1885,120 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>

+      </dia:attribute>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O11">
+      <dia:attribute name="obj_pos">
+        <dia:point val="42.665,24.4"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="42.615,24.35;51.365,29.25"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="42.665,24.4"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="8.6500000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="4.8000000000000007"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Solicitante#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>#Persona esperando ser Afiliado a la obra social por un Promotor.#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>
+      </dia:attribute>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="attributes">

         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#cod_afiliado#</dia:string>
+            <dia:string>#disponibilidad#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1846,16 +2012,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#descripcion#</dia:string>
+            <dia:string>#familiares#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Cantidad de integrantes del grupo familiar a afiliar.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1869,16 +2035,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#aprobada#</dia:string>
+            <dia:string>#observaciones#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Observaciones que puedan ser de utilidad para el Promotor.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1892,10 +2058,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#prestacion#</dia:string>
+            <dia:string>#pendiente#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#bool#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -1920,18 +2086,18 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Generalization" version="0" id="O8">
+    <dia:object type="UML - Generalization" version="0" id="O12">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="23.25,13"/>
+        <dia:point val="39.5,16.15"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="16.025,12.95;24.1,17.35"/>
+        <dia:rectangle val="38.65,16.1;47.04,24.45"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="23.25,13"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="16.075,15.1"/>
-        <dia:point val="16.075,17.3"/>
+        <dia:point val="39.5,16.15"/>
+        <dia:point val="39.5,22.72"/>
+        <dia:point val="46.99,22.72"/>
+        <dia:point val="46.99,24.4"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -1952,307 +2118,187 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O1" connection="6"/>
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O1" connection="6"/>

-        <dia:connection handle="1" to="O2" connection="1"/>
+        <dia:connection handle="1" to="O11" connection="1"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Generalization" version="0" id="O9">
+    <dia:object type="UML - Class" version="0" id="O13">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="23.25,13"/>
+        <dia:point val="10.365,21.26"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="22.4,12.95;24.1,17.35"/>
+        <dia:rectangle val="10.315,21.21;18.965,23.71"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_points">
-        <dia:point val="23.25,13"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="23.275,15.1"/>
-        <dia:point val="23.275,17.3"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="10.365,21.26"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="8.5500000000000007"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
+      <dia:attribute name="elem_height">
+        <dia:real val="2.3999999999999999"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>##</dia:string>
+        <dia:string>#AutorizacionManual#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>

-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="6"/>
-        <dia:connection handle="1" to="O0" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O10">
-      <dia:attribute name="obj_pos">
-        <dia:point val="14.575,28.45"/>
+      <dia:attribute name="comment">
+        <dia:string>#Autorización que debe ser aprobada manualmente, a través de un auditor médico.#</dia:string>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="14.525,21.35;16.425,29.3"/>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_points">
-        <dia:point val="14.575,28.45"/>
-        <dia:point val="16.175,28.45"/>
-        <dia:point val="16.175,22.1"/>
-        <dia:point val="16.075,22.1"/>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="autorouting">
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">

         <dia:boolean val="false"/>
       </dia:attribute>
         <dia:boolean val="false"/>
       </dia:attribute>

-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="false"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:connections>
-        <dia:connection handle="0" to="O4" connection="9"/>
-        <dia:connection handle="1" to="O2" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O11">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.45,16.4"/>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.125,15.65;0.165,27.42"/>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_points">
-        <dia:point val="-1.45,16.4"/>
-        <dia:point val="-2.075,16.4"/>
-        <dia:point val="-2.075,26.57"/>
-        <dia:point val="-0.185,26.57"/>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#1#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>#N#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:connections>
-        <dia:connection handle="0" to="O3" connection="6"/>
-        <dia:connection handle="1" to="O24" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Association" version="0" id="O12">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.425,6.65"/>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.5,6.6;-1.075,14"/>
+      <dia:attribute name="font_height">
+        <dia:real val="0.80000000000000004"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_points">
-        <dia:point val="-1.425,6.65"/>
-        <dia:point val="-1.425,9.15"/>
-        <dia:point val="-1.45,9.15"/>
-        <dia:point val="-1.45,11.6"/>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="1"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#observaciones#</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="multiplicity">
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">

             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>

-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
+          <dia:attribute name="comment">
+            <dia:string>#Comentarios sobre la autorización#</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="aggregate">
+          <dia:attribute name="visibility">

             <dia:enum val="0"/>
           </dia:attribute>
             <dia:enum val="0"/>
           </dia:attribute>

-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
+          <dia:attribute name="abstract">

             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>

-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>

           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>

-      <dia:connections>
-        <dia:connection handle="0" to="O5" connection="6"/>
-        <dia:connection handle="1" to="O3" connection="1"/>
-      </dia:connections>
+      <dia:attribute name="operations"/>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>

     </dia:object>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O13">
+    <dia:object type="UML - Generalization" version="0" id="O14">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="6.175,9.8"/>
+        <dia:point val="11.5,15.25"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="0.975,9.75;6.225,15.1"/>
+        <dia:rectangle val="10.65,15.2;14.69,21.31"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="6.175,9.8"/>
-        <dia:point val="3.6,9.8"/>
-        <dia:point val="3.6,13.5"/>
-        <dia:point val="1.025,13.5"/>
+        <dia:point val="11.5,15.25"/>
+        <dia:point val="11.5,17.97"/>
+        <dia:point val="14.64,17.97"/>
+        <dia:point val="14.64,21.26"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
       </dia:attribute>
       <dia:attribute name="orth_orient">

-        <dia:enum val="0"/>

         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>

+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>

-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="ends">
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite>
-          <dia:attribute name="role">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="arrow">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="aggregate">
-            <dia:enum val="0"/>
-          </dia:attribute>
-        </dia:composite>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>

       </dia:attribute>
       <dia:connections>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O7" connection="14"/>
-        <dia:connection handle="1" to="O3" connection="9"/>
+        <dia:connection handle="0" to="O7" connection="6"/>
+        <dia:connection handle="1" to="O13" connection="1"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O14">
+    <dia:object type="UML - Class" version="0" id="O15">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="29.965,25.36"/>
+        <dia:point val="4.58,21.22"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="29.915,25.31;34.115,30.21"/>
+        <dia:rectangle val="4.53,21.17;9.93,23.07"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="29.965,25.36"/>
+        <dia:point val="4.58,21.22"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="4.0999999999999996"/>
+        <dia:real val="5.2999999999999998"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="1.7999999999999998"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Zona#</dia:string>
+        <dia:string>#Automatica#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>


@@ -2329,130 +2375,72 @@
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>

-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#pais#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#provincia#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#ciudad#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#barrio#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
+      <dia:attribute name="attributes"/>

       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O15">
+    <dia:object type="UML - Generalization" version="0" id="O16">
+      <dia:attribute name="obj_pos">
+        <dia:point val="11.5,15.25"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="7.18,15.2;12.35,21.27"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="11.5,15.25"/>
+        <dia:point val="11.5,17.97"/>
+        <dia:point val="7.23,17.97"/>
+        <dia:point val="7.23,21.22"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="6"/>
+        <dia:connection handle="1" to="O15" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O17">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="28.815,17.31"/>
+        <dia:point val="-5.585,27.52"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="28.765,17.26;34.715,21.36"/>
+        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="28.815,17.31"/>
+        <dia:point val="-5.585,27.52"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="5.8499999999999996"/>
+        <dia:real val="13.199999999999999"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4"/>
+        <dia:real val="4.8000000000000007"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Solicitante#</dia:string>
+        <dia:string>#Cobertura#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Limitaciones de cobertura para un Plan y una Prestación determinada.#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -2461,7 +2449,7 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">

-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>

       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>


@@ -2526,16 +2514,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#disponibilidad#</dia:string>
+            <dia:string>#tiempoPermanencia#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Tiempo#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -2549,16 +2537,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#familiares#</dia:string>
+            <dia:string>#porcentaje#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Porcentaje de la prestación cubierto.#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -2572,17 +2560,40 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#observacion#</dia:string>
+            <dia:string>#limiteAnual#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

+            <dia:string>#Cantidad de prestaciones que se puede realizar por año (cero indica que no hay límite).#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#tipoAutorizacion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#emun(manual,auto)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">

             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>

+          <dia:attribute name="comment">
+            <dia:string>#Indica el tipo de autorización que necesita para realizarse la prestación.#</dia:string>
+          </dia:attribute>

           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>


@@ -2600,65 +2611,30 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Generalization" version="0" id="O16">
-      <dia:attribute name="obj_pos">
-        <dia:point val="23.25,13"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.4,12.95;31.79,17.36"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="23.25,13"/>
-        <dia:point val="23.25,15.1"/>
-        <dia:point val="31.74,15.1"/>
-        <dia:point val="31.74,17.31"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O1" connection="6"/>
-        <dia:connection handle="1" to="O15" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O17">
+    <dia:object type="UML - Class" version="0" id="O18">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="4.865,0.56"/>
+        <dia:point val="0.815,-3.52999"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="4.815,0.51;14.165,3.01"/>
+        <dia:rectangle val="0.765,-3.57999;6.715,-0.27999"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="4.865,0.56"/>
+        <dia:point val="0.815,-3.52999"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="9.25"/>
+        <dia:real val="5.8499999999999996"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Prestacion_Realizada#</dia:string>
+        <dia:string>#Categoria#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="comment">

-        <dia:string>##</dia:string>
+        <dia:string>#Clasificación de las Prestaciones. (esto lo necesitamos por el codificador, no?)#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -2732,17 +2708,40 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha#</dia:string>
+            <dia:string>#codigo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

+            <dia:string>#Identificador único (por codificador, no?)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#nombre#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">

             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>

+          <dia:attribute name="comment">
+            <dia:string>#Nombre de la categoría.#</dia:string>
+          </dia:attribute>

           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>


@@ -2760,55 +2759,633 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="Standard - ZigZagLine" version="0" id="O18">
+    <dia:object type="UML - Association" version="0" id="O19">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="23.275,25.35"/>
+        <dia:point val="7.515,28.22"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="23.225,20.45;23.325,25.4"/>
+        <dia:rectangle val="7.465,26;12.125,29.02"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="23.275,25.35"/>
-        <dia:point val="23.275,22.56"/>
-        <dia:point val="23.275,22.56"/>
-        <dia:point val="23.275,20.5"/>
+        <dia:point val="7.515,28.22"/>
+        <dia:point val="9.895,28.22"/>
+        <dia:point val="9.895,26.8"/>
+        <dia:point val="11.375,26.8"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
       </dia:attribute>
       <dia:attribute name="orth_orient">

-        <dia:enum val="1"/>

         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>

+        <dia:enum val="0"/>

       </dia:attribute>
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
       </dia:attribute>
       </dia:attribute>
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
       </dia:attribute>

+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># *#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="2"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>

       <dia:connections>
       <dia:connections>

-        <dia:connection handle="0" to="O6" connection="1"/>
-        <dia:connection handle="1" to="O0" connection="6"/>
+        <dia:connection handle="0" to="O17" connection="4"/>
+        <dia:connection handle="1" to="O4" connection="3"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O19">
+    <dia:object type="UML - Association" version="0" id="O20">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="-0.935,20.06"/>
+        <dia:point val="18.475,26.8"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-0.985,20.01;6.365,24.91"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="-0.935,20.06"/>
+        <dia:rectangle val="18.425,26;21.95,28.15"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="elem_width">
-        <dia:real val="7.25"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="18.475,26.8"/>
+        <dia:point val="20.0375,26.8"/>
+        <dia:point val="20.0375,27.35"/>
+        <dia:point val="21.6,27.35"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Manual#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">

         <dia:string>##</dia:string>
       </dia:attribute>
         <dia:string>##</dia:string>
       </dia:attribute>

-      <dia:attribute name="comment">
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O4" connection="4"/>
+        <dia:connection handle="1" to="O2" connection="14"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O21">
+      <dia:attribute name="obj_pos">
+        <dia:point val="44.115,-1.34"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="39.225,-2.14;44.815,1.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="44.115,-1.34"/>
+        <dia:point val="42.045,-1.34"/>
+        <dia:point val="42.045,0.8"/>
+        <dia:point val="39.975,0.8"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O10" connection="3"/>
+        <dia:connection handle="1" to="O6" connection="4"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O22">
+      <dia:attribute name="obj_pos">
+        <dia:point val="39.5,8.95"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="35.425,2.55;40.2,10.55"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="39.5,8.95"/>
+        <dia:point val="39.5,6.98251"/>
+        <dia:point val="36.175,6.98251"/>
+        <dia:point val="36.175,3.3"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="1"/>
+        <dia:connection handle="1" to="O6" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O23">
+      <dia:attribute name="obj_pos">
+        <dia:point val="42.665,25.1"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="38.5,24.3;43.365,26.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="42.665,25.1"/>
+        <dia:point val="40.6075,25.1"/>
+        <dia:point val="40.6075,25.8"/>
+        <dia:point val="38.55,25.8"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O11" connection="3"/>
+        <dia:connection handle="1" to="O0" connection="4"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O24">
+      <dia:attribute name="obj_pos">
+        <dia:point val="0.975,13.75"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="0.975,13.75"/>
+        <dia:point val="3.715,13.75"/>
+        <dia:point val="3.715,-0.32999"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># *#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="4"/>
+        <dia:connection handle="1" to="O18" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O25">
+      <dia:attribute name="obj_pos">
+        <dia:point val="5.775,5.35"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.215,4.55;6.825,28.32"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="5.775,5.35"/>
+        <dia:point val="3.965,5.35"/>
+        <dia:point val="3.965,27.52"/>
+        <dia:point val="0.965,27.52"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># * #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="3"/>
+        <dia:connection handle="1" to="O17" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O26">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-5.585,28.22"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-6.635,15.5;-1.175,29.02"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-5.585,28.22"/>
+        <dia:point val="-6.585,28.22"/>
+        <dia:point val="-6.585,22.235"/>
+        <dia:point val="-1.925,22.235"/>
+        <dia:point val="-1.925,16.25"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O17" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O27">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-4.825,13.75"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-5.875,6;-0.35,14.55"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-4.825,13.75"/>
+        <dia:point val="-5.825,13.75"/>
+        <dia:point val="-5.825,10.25"/>
+        <dia:point val="-1.1,10.25"/>
+        <dia:point val="-1.1,6.75"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="3"/>
+        <dia:connection handle="1" to="O5" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O28">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-4,2.75"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-4.05,-5.36749;48.665,4.35"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-4,2.75"/>
+        <dia:point val="-4,-4.56749"/>
+        <dia:point val="47.915,-4.56749"/>
+        <dia:point val="47.915,-2.04"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O5" connection="0"/>
+        <dia:connection handle="1" to="O10" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Class" version="0" id="O29">
+      <dia:attribute name="obj_pos">
+        <dia:point val="33.865,27.8825"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="33.815,27.8325;42.015,31.1325"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="33.865,27.8825"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="8.0999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.2000000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#Historial de planes#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">

         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="abstract">


@@ -2883,62 +3460,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#fecha_vencimiento#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#descipcion_rechazo#</dia:string>
+            <dia:string>#fecha_ingreso#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en que se dio de alta el plan#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -2952,16 +3483,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#observacion#</dia:string>
+            <dia:string>#fecha_egreso#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Fecha en la que el plan no rige mas para el afiliado#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -2980,59 +3511,24 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Generalization" version="0" id="O20">
-      <dia:attribute name="obj_pos">
-        <dia:point val="9.45,13.5"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.64,13.45;10.3,20.11"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.45,13.5"/>
-        <dia:point val="9.45,17.76"/>
-        <dia:point val="2.69,17.76"/>
-        <dia:point val="2.69,20.06"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O19" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O21">
+    <dia:object type="UML - Class" version="0" id="O30">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="6.83,20.22"/>
+        <dia:point val="13.2508,-1.24249"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="6.78,20.17;12.18,22.07"/>
+        <dia:rectangle val="13.2008,-1.29249;28.2508,2.00751"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="6.83,20.22"/>
+        <dia:point val="13.2508,-1.24249"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="5.2999999999999998"/>
+        <dia:real val="14.949999999999999"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="1.7999999999999998"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Automatica#</dia:string>
+        <dia:string>#Telefono#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>


@@ -3109,89 +3605,78 @@
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>
       <dia:attribute name="comment_font_height">
         <dia:real val="1"/>
       </dia:attribute>

-      <dia:attribute name="attributes"/>
+      <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#tipo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum(particular, oficina, celular)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#numero#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Numero de telefono#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>

       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       <dia:attribute name="operations"/>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="UML - Generalization" version="0" id="O22">
-      <dia:attribute name="obj_pos">
-        <dia:point val="9.45,13.5"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.6,13.45;10.3,20.27"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="9.45,13.5"/>
-        <dia:point val="9.45,17.76"/>
-        <dia:point val="9.48,17.76"/>
-        <dia:point val="9.48,20.22"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O7" connection="6"/>
-        <dia:connection handle="1" to="O21" connection="1"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - ZigZagLine" version="0" id="O23">
-      <dia:attribute name="obj_pos">
-        <dia:point val="25.675,28.05"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.625,28;30.015,28.11"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="25.675,28.05"/>
-        <dia:point val="27.82,28.05"/>
-        <dia:point val="27.82,28.06"/>
-        <dia:point val="29.965,28.06"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O6" connection="11"/>
-        <dia:connection handle="1" to="O14" connection="10"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O24">
+    <dia:object type="UML - Class" version="0" id="O31">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="-4.285,26.57"/>
+        <dia:point val="20.1008,11.8075"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-4.335,26.52;3.965,31.42"/>
+        <dia:rectangle val="20.0508,11.7575;31.2508,18.2575"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="-4.285,26.57"/>
+        <dia:point val="20.1008,11.8075"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="8.1999999999999993"/>
+        <dia:real val="11.1"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="6.4000000000000004"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Cobertura#</dia:string>
+        <dia:string>#Direccion#</dia:string>

       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>


@@ -3206,7 +3691,7 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">

-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>

       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>


@@ -3271,16 +3756,39 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#tiempo_de_permanencia#</dia:string>
+            <dia:string>#calle#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Calle del domicilio#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#numero#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Número del domicilio#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -3294,16 +3802,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#porcentaje#</dia:string>
+            <dia:string>#piso#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Piso del domicilio#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -3317,16 +3825,16 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#limite_anual#</dia:string>
+            <dia:string>#departamento#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Departamento del domicilio#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -3340,17 +3848,40 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#tipo_de_autorizacion#</dia:string>
+            <dia:string>#codigoPostal#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string(8)#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

+            <dia:string>#Código postal del domicilio#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#provincia#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#enum([provincias])#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">

             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>

+          <dia:attribute name="comment">
+            <dia:string>#Provincia donde se encuentra el domicilio#</dia:string>
+          </dia:attribute>

           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>


@@ -3368,216 +3899,436 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>

-    <dia:object type="Standard - ZigZagLine" version="0" id="O25">
+    <dia:object type="UML - Association" version="0" id="O32">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="3.915,29.27"/>
+        <dia:point val="20.7008,1.95751"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="3.865,29.2;7.525,29.32"/>
+        <dia:rectangle val="20.6508,1.90751;33.35,11.25"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="3.915,29.27"/>
-        <dia:point val="5.695,29.27"/>
-        <dia:point val="5.695,29.25"/>
-        <dia:point val="7.475,29.25"/>
+        <dia:point val="20.7008,1.95751"/>
+        <dia:point val="20.7008,9.65"/>
+        <dia:point val="33.3,9.65"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
       </dia:attribute>
       <dia:attribute name="orth_orient">

-        <dia:enum val="0"/>

         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>

+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>

       <dia:connections>
       <dia:connections>

-        <dia:connection handle="0" to="O24" connection="11"/>
-        <dia:connection handle="1" to="O4" connection="10"/>
+        <dia:connection handle="0" to="O30" connection="6"/>
+        <dia:connection handle="1" to="O1" connection="3"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="Standard - ZigZagLine" version="0" id="O26">
+    <dia:object type="UML - Association" version="0" id="O33">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="12.725,12.2"/>
+        <dia:point val="31.1508,12.5075"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="11.75,12.15;13.775,18.05"/>
+        <dia:rectangle val="31.1008,11.7075;33.65,14.05"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="12.725,12.2"/>
-        <dia:point val="13.725,12.2"/>
-        <dia:point val="13.725,15.1"/>
-        <dia:point val="11.8,15.1"/>
-        <dia:point val="11.8,18"/>
-        <dia:point val="12.8,18"/>
+        <dia:point val="31.1508,12.5075"/>
+        <dia:point val="32.2254,12.5075"/>
+        <dia:point val="32.2254,13.25"/>
+        <dia:point val="33.3,13.25"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>

-        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">

         <dia:enum val="0"/>
       </dia:attribute>
         <dia:enum val="0"/>
       </dia:attribute>

+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>

       <dia:connections>
       <dia:connections>

-        <dia:connection handle="0" to="O7" connection="21"/>
-        <dia:connection handle="1" to="O2" connection="3"/>
+        <dia:connection handle="0" to="O31" connection="4"/>
+        <dia:connection handle="1" to="O1" connection="14"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Class" version="0" id="O27">
+    <dia:object type="UML - Association" version="0" id="O34">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="0.715,-3.67999"/>
+        <dia:point val="20.7008,-1.24249"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="0.665,-3.72999;5.315,-0.42999"/>
+        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="elem_corner">
-        <dia:point val="0.715,-3.67999"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="20.7008,-1.24249"/>
+        <dia:point val="20.7008,-4.01749"/>
+        <dia:point val="-1.1,-4.01749"/>
+        <dia:point val="-1.1,2.75"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="elem_width">
-        <dia:real val="4.5499999999999998"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>

       </dia:attribute>
       <dia:attribute name="name">
       </dia:attribute>
       <dia:attribute name="name">

-        <dia:string>#Categoria#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="comment">

         <dia:string>##</dia:string>
       </dia:attribute>
         <dia:string>##</dia:string>
       </dia:attribute>

-      <dia:attribute name="abstract">
-        <dia:boolean val="false"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="suppress_attributes">
-        <dia:boolean val="false"/>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
+      <dia:connections>
+        <dia:connection handle="0" to="O30" connection="1"/>
+        <dia:connection handle="1" to="O5" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O35">
+      <dia:attribute name="obj_pos">
+        <dia:point val="25.6258,18.2075"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="1.75,6.7;26.3258,20.6075"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="25.6258,18.2075"/>
+        <dia:point val="25.6258,19.2075"/>
+        <dia:point val="1.8,19.2075"/>
+        <dia:point val="1.8,6.75"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
+      <dia:connections>
+        <dia:connection handle="0" to="O31" connection="6"/>
+        <dia:connection handle="1" to="O5" connection="7"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O36">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1.8,3.45"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="1.05,2.65;12.2,6.25"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="1.8,3.45"/>
+        <dia:point val="11.5,3.45"/>
+        <dia:point val="11.5,4.65"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica"/>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica"/>
+      <dia:connections>
+        <dia:connection handle="0" to="O5" connection="4"/>
+        <dia:connection handle="1" to="O7" connection="1"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O37">
+      <dia:attribute name="obj_pos">
+        <dia:point val="17.225,5.35"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="17.175,4.55;22.35,24.55"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
+      <dia:attribute name="orth_points">
+        <dia:point val="17.225,5.35"/>
+        <dia:point val="19.515,5.35"/>
+        <dia:point val="19.515,23.75"/>
+        <dia:point val="21.6,23.75"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="comment_font_height">
-        <dia:real val="1"/>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>

       </dia:attribute>
       </dia:attribute>

-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#codigo#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">

             <dia:string>##</dia:string>
           </dia:attribute>
             <dia:string>##</dia:string>
           </dia:attribute>

-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
+          <dia:attribute name="multiplicity">
+            <dia:string># *#</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="visibility">
+          <dia:attribute name="aggregate">

             <dia:enum val="0"/>
           </dia:attribute>
             <dia:enum val="0"/>
           </dia:attribute>

-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="class_scope">
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">

             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>

+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>

         </dia:composite>
         </dia:composite>

-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#nombre#</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="4"/>
+        <dia:connection handle="1" to="O2" connection="3"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="0" id="O38">
+      <dia:attribute name="obj_pos">
+        <dia:point val="21.6,28.65"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="20.85,27.9;32.75,34.0575"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="21.6,28.65"/>
+        <dia:point val="21.6,34.0075"/>
+        <dia:point val="26.1,34.0075"/>
+        <dia:point val="26.1,28.65"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#titularidad#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>#titular#</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="type">
-            <dia:string>##</dia:string>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>#miembro grupo fam.#</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>

           </dia:attribute>
           </dia:attribute>

-          <dia:attribute name="class_scope">
+          <dia:attribute name="arrow">

             <dia:boolean val="false"/>
           </dia:attribute>
             <dia:boolean val="false"/>
           </dia:attribute>

+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>

         </dia:composite>
       </dia:attribute>
         </dia:composite>
       </dia:attribute>

-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
+      <dia:connections>
+        <dia:connection handle="0" to="O2" connection="5"/>
+        <dia:connection handle="1" to="O2" connection="6"/>
+      </dia:connections>

     </dia:object>
     </dia:object>

-    <dia:object type="Standard - ZigZagLine" version="0" id="O28">
+    <dia:object type="UML - Association" version="0" id="O39">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="2.99,-0.47999"/>
+        <dia:point val="14.925,30.9"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="1.025,-0.52999;3.04,12.61"/>
+        <dia:rectangle val="14.875,30.3325;38.665,34.8825"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="2.99,-0.47999"/>
-        <dia:point val="2.99,12.56"/>
-        <dia:point val="1.075,12.56"/>
-        <dia:point val="1.075,12.51"/>
+        <dia:point val="14.925,30.9"/>
+        <dia:point val="14.925,34.3575"/>
+        <dia:point val="37.915,34.3575"/>
+        <dia:point val="37.915,31.0825"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -3587,22 +4338,59 @@
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
       </dia:attribute>

+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>

       <dia:connections>
       <dia:connections>

-        <dia:connection handle="0" to="O27" connection="6"/>
+        <dia:connection handle="0" to="O4" connection="6"/>
+        <dia:connection handle="1" to="O29" connection="6"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Association" version="0" id="O29">
+    <dia:object type="UML - Association" version="0" id="O40">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="28.815,18.01"/>
+        <dia:point val="30.6,27.35"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="26.15,17.255;28.865,19.61"/>
+        <dia:rectangle val="30.55,26.55;34.215,29.3825"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="28.815,18.01"/>
-        <dia:point val="27.5075,18.01"/>
-        <dia:point val="27.5075,18"/>
-        <dia:point val="26.2,18"/>
+        <dia:point val="30.6,27.35"/>
+        <dia:point val="32.2325,27.35"/>
+        <dia:point val="32.2325,28.5825"/>
+        <dia:point val="33.865,28.5825"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3621,7 +4409,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">

-            <dia:string>##</dia:string>
+            <dia:string>#1#</dia:string>

           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>


@@ -3635,7 +4423,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">

-            <dia:string>##</dia:string>
+            <dia:string>#1#</dia:string>

           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>


@@ -3646,73 +4434,124 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
         </dia:composite>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O15" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
+        <dia:connection handle="0" to="O2" connection="15"/>
+        <dia:connection handle="1" to="O29" connection="3"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="Standard - ZigZagLine" version="0" id="O30">
+    <dia:object type="UML - Association" version="0" id="O41">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="-1.425,1.05"/>
+        <dia:point val="32.375,0.8"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-1.485,-4.72999;35.665,27.31"/>
+        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="-1.425,1.05"/>
-        <dia:point val="-1.435,1.05"/>
-        <dia:point val="-1.435,-4.67999"/>
-        <dia:point val="35.615,-4.67999"/>
-        <dia:point val="35.615,27.26"/>
-        <dia:point val="34.065,27.26"/>
+        <dia:point val="32.375,0.8"/>
+        <dia:point val="30.2629,0.8"/>
+        <dia:point val="30.2629,-0.54249"/>
+        <dia:point val="28.1508,-0.54249"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
         <dia:enum val="0"/>

-        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">

         <dia:enum val="0"/>
       </dia:attribute>
         <dia:enum val="0"/>
       </dia:attribute>

-      <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       <dia:connections>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O5" connection="1"/>
-        <dia:connection handle="1" to="O14" connection="9"/>
+        <dia:connection handle="0" to="O6" connection="3"/>
+        <dia:connection handle="1" to="O30" connection="4"/>

       </dia:connections>
     </dia:object>
       </dia:connections>
     </dia:object>

-    <dia:object type="UML - Generalization" version="0" id="O31">
+    <dia:object type="UML - Association" version="0" id="O42">

       <dia:attribute name="obj_pos">
       <dia:attribute name="obj_pos">

-        <dia:point val="9.45,5.5"/>
+        <dia:point val="25.6258,11.8075"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="8.6,2.91;10.3,5.55"/>
+        <dia:rectangle val="25.5758,2;32.725,13.4075"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="9.45,5.5"/>
-        <dia:point val="9.45,4.23"/>
-        <dia:point val="9.49,4.23"/>
-        <dia:point val="9.49,2.96"/>
+        <dia:point val="25.6258,11.8075"/>
+        <dia:point val="25.6258,2.8"/>
+        <dia:point val="32.375,2.8"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
         <dia:enum val="0"/>

-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
       </dia:attribute>

-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       <dia:connections>
       </dia:attribute>
       <dia:connections>

-        <dia:connection handle="0" to="O7" connection="1"/>
-        <dia:connection handle="1" to="O17" connection="6"/>
+        <dia:connection handle="0" to="O31" connection="1"/>
+        <dia:connection handle="1" to="O6" connection="10"/>

       </dia:connections>
     </dia:object>
   </dia:layer>
       </dia:connections>
     </dia:object>
   </dia:layer>