diff --git a/django/business_model_canvas_app/migrations/0001_initial.py b/django/business_model_canvas_app/migrations/0001_initial.py
new file mode 100644
index 0000000..5c800c3
--- /dev/null
+++ b/django/business_model_canvas_app/migrations/0001_initial.py
@@ -0,0 +1,264 @@
+# Generated by Django 4.1.7 on 2023-05-14 15:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="BMCModelloDiBusiness",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("descrizione", models.CharField(max_length=4096, null=True)),
+            ],
+            options={
+                "verbose_name": "bmcmodellodibusiness",
+                "verbose_name_plural": "bmcmodellodibusiness",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCSegmentiDiClientela",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("settore_cliente", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCSegmentiDiClientela_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmcsegmentidiclientela",
+                "verbose_name_plural": "bmcsegmentidiclientela",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCRisorsaChiave",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("risorsa_chiave", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCRisorsaChiave_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmcrisorsachiave",
+                "verbose_name_plural": "bmcrisorsachiave",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCRelazioneConCliente",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("relazione_cliente", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCRelazioneConCliente_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmcrelazioneconcliente",
+                "verbose_name_plural": "bmcrelazioneconcliente",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCPropostaDiValore",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("proposta_di_valore", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCPropostaDiValore_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmcpropostadivalore",
+                "verbose_name_plural": "bmcpropostadivalore",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCPartnerChiave",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("partnership_azienda", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCPartnerChiave_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmcpartnerchiave",
+                "verbose_name_plural": "bmcpartnerchiave",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCFlussoDiRicavi",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("flusso_di_ricavi", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCFlussoDiRicavi_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmcflussodiricavi",
+                "verbose_name_plural": "bmcflussodiricavi",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCCanaleDiDistribuzione",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("canale", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCCanaleDiDistribuzione_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmccanaledidistribuzione",
+                "verbose_name_plural": "bmccanaledidistribuzione",
+            },
+        ),
+        migrations.CreateModel(
+            name="BMCAttivitaChiave",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("attivita_chiave", models.IntegerField(blank=True, null=True)),
+                (
+                    "modello_di_business",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="BMCAttivitaChiave_da_BMCModelloDiBusiness_modello_di_business",
+                        to="business_model_canvas_app.bmcmodellodibusiness",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "bmcattivitachiave",
+                "verbose_name_plural": "bmcattivitachiave",
+            },
+        ),
+    ]
diff --git a/django/business_model_canvas_app/migrations/__init__.py b/django/business_model_canvas_app/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/django/contatti_app/migrations/0001_initial.py b/django/contatti_app/migrations/0001_initial.py
index 4842bf3..aa9b4f0 100644
--- a/django/contatti_app/migrations/0001_initial.py
+++ b/django/contatti_app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.7 on 2023-05-14 13:47
+# Generated by Django 4.1.7 on 2023-05-14 15:43
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -14,7 +14,36 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name="ContattoRubrica",
+            name="SoggettoContattabile",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("rimosso", models.BooleanField(blank=True, null=True)),
+                (
+                    "polymorphic_ctype",
+                    models.ForeignKey(
+                        editable=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="polymorphic_%(app_label)s.%(class)s_set+",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "soggetto contattabile",
+                "verbose_name_plural": "soggetti contattabili",
+            },
+        ),
+        migrations.CreateModel(
+            name="VoceContattoRubrica",
             fields=[
                 (
                     "id",
@@ -35,22 +64,78 @@ class Migration(migrations.Migration):
                         to="contenttypes.contenttype",
                     ),
                 ),
+                (
+                    "soggetto",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="contatti",
+                        to="contatti_app.soggettocontattabile",
+                    ),
+                ),
             ],
             options={
                 "verbose_name": "contatto di rubrica",
                 "verbose_name_plural": "contatti di rubrica",
             },
         ),
+        migrations.CreateModel(
+            name="Email",
+            fields=[
+                (
+                    "vocecontattorubrica_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="contatti_app.vocecontattorubrica",
+                    ),
+                ),
+                ("indirizzo_email", models.CharField(max_length=30)),
+                ("note", models.CharField(max_length=64, null=True)),
+            ],
+            options={
+                "verbose_name": "email",
+                "verbose_name_plural": "email",
+            },
+            bases=("contatti_app.vocecontattorubrica",),
+        ),
+        migrations.CreateModel(
+            name="Fax",
+            fields=[
+                (
+                    "vocecontattorubrica_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="contatti_app.vocecontattorubrica",
+                    ),
+                ),
+                ("numero", models.CharField(max_length=20, null=True)),
+                ("note", models.CharField(max_length=64, null=True)),
+            ],
+            options={
+                "verbose_name": "fax",
+                "verbose_name_plural": "fax",
+            },
+            bases=("contatti_app.vocecontattorubrica",),
+        ),
         migrations.CreateModel(
             name="Indirizzo",
             fields=[
                 (
-                    "id",
-                    models.AutoField(
+                    "vocecontattorubrica_ptr",
+                    models.OneToOneField(
                         auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
                         primary_key=True,
                         serialize=False,
-                        verbose_name="ID",
+                        to="contatti_app.vocecontattorubrica",
                     ),
                 ),
                 (
@@ -102,97 +187,13 @@ class Migration(migrations.Migration):
                         to="dati_geo_app.nazione",
                     ),
                 ),
-                (
-                    "polymorphic_ctype",
-                    models.ForeignKey(
-                        editable=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="polymorphic_%(app_label)s.%(class)s_set+",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
             ],
             options={
                 "verbose_name": "indirizzo",
                 "verbose_name_plural": "indirizzi",
                 "abstract": False,
             },
-        ),
-        migrations.CreateModel(
-            name="SoggettoContattabile",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("rimosso", models.BooleanField(blank=True, null=True)),
-                (
-                    "polymorphic_ctype",
-                    models.ForeignKey(
-                        editable=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="polymorphic_%(app_label)s.%(class)s_set+",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "soggetto contattabile",
-                "verbose_name_plural": "soggetti contattabili",
-            },
-        ),
-        migrations.CreateModel(
-            name="Email",
-            fields=[
-                (
-                    "contattorubrica_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="contatti_app.contattorubrica",
-                    ),
-                ),
-                ("indirizzo", models.CharField(max_length=30)),
-                ("note", models.CharField(max_length=64, null=True)),
-            ],
-            options={
-                "verbose_name": "email",
-                "verbose_name_plural": "email",
-            },
-            bases=("contatti_app.contattorubrica",),
-        ),
-        migrations.CreateModel(
-            name="Fax",
-            fields=[
-                (
-                    "contattorubrica_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="contatti_app.contattorubrica",
-                    ),
-                ),
-                ("numero", models.CharField(max_length=20, null=True)),
-                ("note", models.CharField(max_length=64, null=True)),
-            ],
-            options={
-                "verbose_name": "fax",
-                "verbose_name_plural": "fax",
-            },
-            bases=("contatti_app.contattorubrica",),
+            bases=("contatti_app.vocecontattorubrica", models.Model),
         ),
         migrations.CreateModel(
             name="PersonaFisica",
@@ -240,49 +241,18 @@ class Migration(migrations.Migration):
             },
             bases=("contatti_app.soggettocontattabile",),
         ),
-        migrations.CreateModel(
-            name="Residenza",
-            fields=[
-                (
-                    "indirizzo_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="contatti_app.indirizzo",
-                    ),
-                ),
-                (
-                    "inquilino",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="residenze",
-                        to="contatti_app.soggettocontattabile",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "residenza",
-                "verbose_name_plural": "residenze",
-            },
-            bases=("contatti_app.indirizzo",),
-        ),
         migrations.CreateModel(
             name="Telefono",
             fields=[
                 (
-                    "contattorubrica_ptr",
+                    "vocecontattorubrica_ptr",
                     models.OneToOneField(
                         auto_created=True,
                         on_delete=django.db.models.deletion.CASCADE,
                         parent_link=True,
                         primary_key=True,
                         serialize=False,
-                        to="contatti_app.contattorubrica",
+                        to="contatti_app.vocecontattorubrica",
                     ),
                 ),
                 ("numero", models.CharField(max_length=20)),
@@ -293,7 +263,7 @@ class Migration(migrations.Migration):
                 "verbose_name": "telefono",
                 "verbose_name_plural": "telefono",
             },
-            bases=("contatti_app.contattorubrica",),
+            bases=("contatti_app.vocecontattorubrica",),
         ),
         migrations.CreateModel(
             name="Societa",
@@ -308,7 +278,6 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("ragione_sociale", models.CharField(max_length=1024)),
-                ("sede_legale", models.IntegerField()),
                 (
                     "nazione",
                     models.ForeignKey(
@@ -333,15 +302,6 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "societa",
             },
         ),
-        migrations.AddField(
-            model_name="contattorubrica",
-            name="soggetto",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="contatti",
-                to="contatti_app.soggettocontattabile",
-            ),
-        ),
         migrations.CreateModel(
             name="Pec",
             fields=[
@@ -367,14 +327,14 @@ class Migration(migrations.Migration):
             name="Sede",
             fields=[
                 (
-                    "residenza_ptr",
+                    "indirizzo_ptr",
                     models.OneToOneField(
                         auto_created=True,
                         on_delete=django.db.models.deletion.CASCADE,
                         parent_link=True,
                         primary_key=True,
                         serialize=False,
-                        to="contatti_app.residenza",
+                        to="contatti_app.indirizzo",
                     ),
                 ),
                 ("is_legale", models.BooleanField(blank=True, null=True)),
@@ -393,7 +353,7 @@ class Migration(migrations.Migration):
                 "verbose_name": "sede",
                 "verbose_name_plural": "sedi",
             },
-            bases=("contatti_app.residenza",),
+            bases=("contatti_app.indirizzo",),
         ),
         migrations.CreateModel(
             name="PersonaContattoAzienda",
diff --git a/django/contatti_app/migrations/0002_personafisica_is_privato.py b/django/contatti_app/migrations/0002_personafisica_is_privato.py
new file mode 100644
index 0000000..680d83b
--- /dev/null
+++ b/django/contatti_app/migrations/0002_personafisica_is_privato.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.1.7 on 2023-05-14 16:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("contatti_app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="personafisica",
+            name="is_privato",
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/django/contatti_app/modello_database.xml b/django/contatti_app/modello_database.xml
index ad482ba..605a295 100644
--- a/django/contatti_app/modello_database.xml
+++ b/django/contatti_app/modello_database.xml
@@ -37,78 +37,66 @@
 		<type label="SET" length="1" sql="SET" quote=""/>
 		<type label="Bit" length="0" sql="bit" quote=""/>
 	</group>
-</datatypes><table x="1899" y="1298" name="PersonaContattoAzienda">
+</datatypes><table x="1241" y="636" name="PersonaContattoAzienda">
+<row name="personafisica_ptr" null="1" autoincrement="1">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="PersonaFisica" row="soggettocontattabile_ptr" />
+</row>
 <row name="azienda" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
-</row>
-<row name="persona_ptr" null="1" autoincrement="1">
-<datatype>INTEGER</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>persona_ptr</part>
+<part>personafisica_ptr</part>
 </key>
 </table>
-<table x="1924" y="823" name="SoggettoFiscale">
-<row name="indirizzo_pec" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default><relation table="Pec" row="email_ptr" />
-</row>
-<row name="sede_legale" null="0" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default></row>
-<row name="stabile_organizzazione" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default></row>
-<row name="nazione" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default>
-</row>
+<table x="559" y="767" name="Nazione">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="revisione_principale" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
-</row>
-<row name="rimosso" null="1" autoincrement="0">
-<datatype>bit</datatype>
+<row name="codifica" null="0" autoincrement="0">
+<datatype>CHAR(2)</datatype>
+<default>'NULL'</default></row>
+<row name="descrizione" null="1" autoincrement="0">
+<datatype>VARCHAR(250)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="2178" y="822" name="DatoDiContatto">
+<table x="2048" y="345" name="VoceContattoRubrica">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="soggetto_fiscale" null="1" autoincrement="0">
+<row name="soggetto" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
 </row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="2468" y="411" name="Telefono">
-<row name="datodicontatto_ptr" null="1" autoincrement="1">
+<table x="1820" y="205" name="Telefono">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="DatoDiContatto" row="id" />
+<default>NULL</default><relation table="VoceContattoRubrica" row="id" />
 </row>
 <row name="numero" null="0" autoincrement="0">
 <datatype>VARCHAR(20)</datatype>
 <default>'NULL'</default></row>
+<row name="interno" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default></row>
 <row name="note" null="1" autoincrement="0">
 <datatype>VARCHAR(64)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>datodicontatto_ptr</part>
+<part>contattorubrica_ptr</part>
 </key>
 </table>
-<table x="2160" y="657" name="Email">
-<row name="datodicontatto_ptr" null="1" autoincrement="1">
+<table x="2050" y="220" name="Email">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="DatoDiContatto" row="id" />
+<default>NULL</default><relation table="VoceContattoRubrica" row="id" />
 </row>
 <row name="indirizzo" null="0" autoincrement="0">
 <datatype>VARCHAR(30)</datatype>
@@ -117,13 +105,13 @@
 <datatype>VARCHAR(64)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>datodicontatto_ptr</part>
+<part>contattorubrica_ptr</part>
 </key>
 </table>
-<table x="2235" y="1322" name="PersonaFisica">
-<row name="soggetto_fiscale_ptr" null="1" autoincrement="1">
+<table x="1525" y="605" name="PersonaFisica">
+<row name="soggettocontattabile_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
 </row>
 <row name="titolo" null="1" autoincrement="0">
 <datatype>VARCHAR(10)</datatype>
@@ -134,41 +122,45 @@
 <row name="cognome" null="1" autoincrement="0">
 <datatype>VARCHAR(60)</datatype>
 <default>NULL</default></row>
+<row name="is_privato" null="1" autoincrement="0">
+<datatype>bit</datatype>
+<default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>soggetto_fiscale_ptr</part>
+<part>soggettocontattabile_ptr</part>
 </key>
 </table>
-<table x="1956" y="1193" name="PersonaGiuridica">
-<row name="soggetto_fiscale_ptr" null="1" autoincrement="1">
+<table x="1861" y="590" name="PersonaGiuridica">
+<row name="soggettocontattabile_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
 </row>
 <row name="denominazione" null="1" autoincrement="0">
 <datatype>VARCHAR(80)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>soggetto_fiscale_ptr</part>
+<part>soggettocontattabile_ptr</part>
 </key>
 </table>
-<table x="1681" y="1155" name="Sede">
-<row name="id" null="1" autoincrement="1">
+<table x="1434" y="259" name="Sede">
+<row name="indirizzo_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default></row>
-<row name="inquilino" null="1" autoincrement="0">
+<default>NULL</default><relation table="Indirizzo" row="contattorubrica_ptr" />
+</row>
+<row name="societa" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="Societa" row="id" />
 </row>
 <row name="is_legale" null="1" autoincrement="0">
 <datatype>bit</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>id</part>
+<part>indirizzo_ptr</part>
 </key>
 </table>
-<table x="2235" y="493" name="Fax">
-<row name="datodicontatto_ptr" null="1" autoincrement="1">
+<table x="1823" y="349" name="Fax">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="DatoDiContatto" row="id" />
+<default>NULL</default><relation table="VoceContattoRubrica" row="id" />
 </row>
 <row name="numero" null="1" autoincrement="0">
 <datatype>VARCHAR(20)</datatype>
@@ -177,16 +169,84 @@
 <datatype>VARCHAR(64)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>datodicontatto_ptr</part>
+<part>contattorubrica_ptr</part>
 </key>
 </table>
-<table x="2017" y="516" name="Pec">
+<table x="2098" y="148" name="Pec">
 <row name="email_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="Email" row="datodicontatto_ptr" />
+<default>NULL</default><relation table="Email" row="contattorubrica_ptr" />
 </row>
 <key type="PRIMARY" name="">
 <part>email_ptr</part>
 </key>
 </table>
+<table x="301" y="470" name="AbstractIndirizzo">
+<row name="id" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>None</default></row>
+<row name="duf" null="1" autoincrement="0">
+<datatype>VARCHAR(256)</datatype>
+<default>'None'</default></row>
+<row name="civico" null="1" autoincrement="0">
+<datatype>VARCHAR(256)</datatype>
+<default>'None'</default></row>
+<row name="altro" null="1" autoincrement="0">
+<datatype>VARCHAR(2048)</datatype>
+<default>'None'</default></row>
+<row name="cap_id" null="1" autoincrement="0">
+<datatype>VARCHAR(5)</datatype>
+<default>'None'</default></row>
+<row name="comune_id" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>None</default></row>
+<row name="dug_id" null="1" autoincrement="0">
+<datatype>VARCHAR(40)</datatype>
+<default>'None'</default></row>
+<row name="nazione" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Nazione" row="id" />
+</row>
+<key type="PRIMARY" name="">
+<part>id</part>
+</key>
+</table>
+<table x="1795" y="486" name="SoggettoContattabile">
+<row name="id" null="1" autoincrement="1">
+<datatype>INTEGER</datatype>
+<default>NULL</default></row>
+<key type="PRIMARY" name="">
+<part>id</part>
+</key>
+</table>
+<table x="2033" y="81" name="Indirizzo">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="AbstractIndirizzo" row="id" />
+<relation table="VoceContattoRubrica" row="id" />
+</row>
+<key type="PRIMARY" name="">
+<part>contattorubrica_ptr</part>
+</key>
+<comment>&lt;AbstractIndirizzo&gt;</comment>
+</table>
+<table x="1288" y="415" name="Societa">
+<row name="id" null="1" autoincrement="1">
+<datatype>INTEGER</datatype>
+<default>NULL</default></row>
+<row name="nazione" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Nazione" row="id" />
+</row>
+<row name="soggetto" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
+</row>
+<row name="ragione_sociale" null="1" autoincrement="0">
+<datatype>VARCHAR(1024)</datatype>
+<default>NULL</default></row>
+<key type="PRIMARY" name="">
+<part>id</part>
+</key>
+</table>
 </sql>
diff --git a/django/contatti_app/models.py b/django/contatti_app/models.py
index d44160c..4532bb3 100644
--- a/django/contatti_app/models.py
+++ b/django/contatti_app/models.py
@@ -11,7 +11,7 @@ class SoggettoContattabile(PolymorphicModel):
 
     rimosso = models.BooleanField(null=True, blank=True)
 
-class ContattoRubrica(PolymorphicModel):
+class VoceContattoRubrica(PolymorphicModel):
     class Meta:
         verbose_name = 'contatto di rubrica'
         verbose_name_plural = 'contatti di rubrica'
@@ -42,7 +42,7 @@ class PersonaFisica(SoggettoContattabile):
     titolo = models.CharField(null=True, max_length=10)
     nome = models.CharField(null=True, max_length=60)
     cognome = models.CharField(null=True, max_length=60)
-
+    is_privato = models.BooleanField(null=False, blank=False, default=True)
 
 class PersonaGiuridica(SoggettoContattabile):
     class Meta:
@@ -61,7 +61,7 @@ class PersonaGiuridica(SoggettoContattabile):
     denominazione = models.CharField(null=True, max_length=80)
 
 
-class Telefono(ContattoRubrica):
+class Telefono(VoceContattoRubrica):
     class Meta:
         verbose_name = 'telefono'
         verbose_name_plural = 'telefono'
@@ -80,18 +80,18 @@ class Telefono(ContattoRubrica):
     note = models.CharField(null=True, max_length=64)
 
 
-class Email(ContattoRubrica):
+class Email(VoceContattoRubrica):
     class Meta:
         verbose_name = 'email'
         verbose_name_plural = 'email'
 
     def __str__(self):
-        eml = self.indirizzo
+        eml = self.indirizzo_email
         if self.note:
             eml += ' (!)'
         return eml
 
-    indirizzo = models.CharField(max_length=30)
+    indirizzo_email = models.CharField(max_length=30)
     note = models.CharField(null=True, max_length=64)
 
 
@@ -104,7 +104,7 @@ class Pec(Email):
         return f"Pec (id: {self.id})"
 
 
-class Fax(ContattoRubrica):
+class Fax(VoceContattoRubrica):
     class Meta:
         verbose_name = 'fax'
         verbose_name_plural = 'fax'
@@ -118,23 +118,12 @@ class Fax(ContattoRubrica):
     numero = models.CharField(null=True, max_length=20)
     note = models.CharField(null=True, max_length=64)
 
-class Indirizzo(PolymorphicModel, AbstractIndirizzo):
+class Indirizzo(VoceContattoRubrica, AbstractIndirizzo):
     class Meta(AbstractIndirizzo.Meta):
         pass
 
 
-class Residenza(Indirizzo):
-    class Meta:
-        verbose_name = 'residenza'
-        verbose_name_plural = 'residenze'
-
-    def __str__(self):
-        return f"Residenza (id: {self.id})"
-
-    inquilino = models.ForeignKey(SoggettoContattabile, on_delete=models.CASCADE,
-                                  null=True, blank=True, related_name="residenze")
-
-class Sede(Residenza):
+class Sede(Indirizzo):
     class Meta:
         verbose_name = 'sede'
         verbose_name_plural = 'sedi'
@@ -164,7 +153,7 @@ class Societa(models.Model):
     ragione_sociale = models.CharField(max_length=1024)
     nazione = models.ForeignKey('dati_geo_app.Nazione', on_delete=models.CASCADE, null=True,
                                 blank=True, related_name="societa")
-    sede_legale = models.IntegerField()
+    
 
 class PersonaContattoAzienda(PersonaFisica):
     class Meta:
diff --git a/django/fattura_elettronica_app/migrations/0001_initial.py b/django/fattura_elettronica_app/migrations/0001_initial.py
index 92bc83a..8c57fc2 100644
--- a/django/fattura_elettronica_app/migrations/0001_initial.py
+++ b/django/fattura_elettronica_app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.7 on 2023-05-14 13:48
+# Generated by Django 4.1.7 on 2023-05-14 15:43
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -9,8 +9,8 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("dati_geo_app", "0007_delete_indirizzo"),
-        ("contenttypes", "0002_remove_content_type_name"),
         ("contatti_app", "0001_initial"),
+        ("contenttypes", "0002_remove_content_type_name"),
     ]
 
     operations = [
@@ -597,7 +597,6 @@ class Migration(migrations.Migration):
                         verbose_name="ID",
                     ),
                 ),
-                ("sede_legale", models.IntegerField()),
                 ("cod_eori", models.CharField(max_length=17, null=True)),
                 ("numero_licenza_guida", models.CharField(max_length=20, null=True)),
                 ("rimosso", models.BooleanField(blank=True, null=True)),
@@ -689,6 +688,14 @@ class Migration(migrations.Migration):
                         to="fattura_elettronica_app.regimefiscale",
                     ),
                 ),
+                (
+                    "sede_legale",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="SoggettoFiscale_da_Indirizzo",
+                        to="contatti_app.indirizzo",
+                    ),
+                ),
                 (
                     "stabile_organizzazione",
                     models.ForeignKey(
@@ -1015,7 +1022,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="SoggettiFatturaElettronica_da_DatoDiContatto_contatto_cedente_prestatore",
-                to="contatti_app.contattorubrica",
+                to="contatti_app.vocecontattorubrica",
             ),
         ),
         migrations.AddField(
diff --git a/django/fattura_elettronica_app/migrations/0002_rename_sede_legale_soggettofiscale_sede.py b/django/fattura_elettronica_app/migrations/0002_rename_sede_legale_soggettofiscale_sede.py
new file mode 100644
index 0000000..48aeef9
--- /dev/null
+++ b/django/fattura_elettronica_app/migrations/0002_rename_sede_legale_soggettofiscale_sede.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.1.7 on 2023-05-14 16:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("fattura_elettronica_app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="soggettofiscale",
+            old_name="sede_legale",
+            new_name="sede",
+        ),
+    ]
diff --git a/django/fattura_elettronica_app/models.py b/django/fattura_elettronica_app/models.py
index 6782dd3..6032ad7 100644
--- a/django/fattura_elettronica_app/models.py
+++ b/django/fattura_elettronica_app/models.py
@@ -137,7 +137,7 @@ class SoggettiFatturaElettronica(models.Model):
 
     formato_trasmissione = models.ForeignKey('FormatoTrasmissione', on_delete=models.CASCADE, null=True,
                                              blank=True, related_name="SoggettiFatturaElettronica_da_FormatoTrasmissione_formato_trasmissione")
-    contatto_cedente_prestatore = models.ForeignKey('contatti_app.ContattoRubrica', on_delete=models.CASCADE, null=True,
+    contatto_cedente_prestatore = models.ForeignKey('contatti_app.VoceContattoRubrica', on_delete=models.CASCADE, null=True,
                                                     blank=True, related_name="SoggettiFatturaElettronica_da_DatoDiContatto_contatto_cedente_prestatore")
     riferimento_amministrazione = models.CharField(null=True, max_length=20)
     trasmittente = models.ForeignKey('SoggettoFiscale', on_delete=models.CASCADE,
@@ -173,7 +173,8 @@ class SoggettoFiscale(PolymorphicModel):
                                     blank=True, related_name="SoggettoFiscale_da_PartitaIvaCF_partita_iva")
     codice_sdi = models.ForeignKey('CodiceDestinatario', on_delete=models.CASCADE, null=True,
                                    blank=True, related_name="SoggettoFiscale_da_CodiceDestinatario_codice_sdi")
-    sede_legale = models.IntegerField()
+    sede = models.ForeignKey('contatti_app.Indirizzo', on_delete=models.CASCADE, null=False,
+                                   blank=False, related_name="SoggettoFiscale_da_Indirizzo")
     stabile_organizzazione = models.ForeignKey('contatti_app.Indirizzo',null=True, blank=True,on_delete=models.SET_NULL,related_name='stabile_organizzazione')
     cod_eori = models.CharField(null=True, max_length=17)
     nazione = models.ForeignKey('dati_geo_app.Nazione', on_delete=models.CASCADE, null=True,
diff --git a/django/offerte_app/migrations/0001_initial.py b/django/offerte_app/migrations/0001_initial.py
index 8ea0c65..c153dac 100644
--- a/django/offerte_app/migrations/0001_initial.py
+++ b/django/offerte_app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.7 on 2023-05-14 13:48
+# Generated by Django 4.1.7 on 2023-05-14 15:43
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -8,8 +8,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("contatti_app", "0001_initial"),
         ("fattura_elettronica_app", "0001_initial"),
+        ("contatti_app", "0001_initial"),
     ]
 
     operations = [
diff --git a/django/sangue_app/migrations/0001_initial.py b/django/sangue_app/migrations/0001_initial.py
index bf3e95f..d7f5d08 100644
--- a/django/sangue_app/migrations/0001_initial.py
+++ b/django/sangue_app/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.7 on 2023-05-14 13:48
+# Generated by Django 4.1.7 on 2023-05-14 15:43
 
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/django/sangue_django/modello_dati.xml b/django/sangue_django/modello_dati.xml
index 68e72c5..71d164b 100644
--- a/django/sangue_django/modello_dati.xml
+++ b/django/sangue_django/modello_dati.xml
@@ -37,7 +37,7 @@
 		<type label="SET" length="1" sql="SET" quote=""/>
 		<type label="Bit" length="0" sql="bit" quote=""/>
 	</group>
-</datatypes><table x="1637" y="1693" name="DestinatarioOfferta">
+</datatypes><table x="0" y="1803" name="DestinatarioOfferta">
 <row name="destinazione" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="Sede" row="indirizzo_ptr" />
@@ -47,13 +47,13 @@
 <default>NULL</default></row>
 <row name="intestatario" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="PersonaContattoAzienda" row="persona_ptr" />
+<default>NULL</default><relation table="PersonaContattoAzienda" row="personafisica_ptr" />
 </row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="1390" y="1864" name="GruppoOfferte">
+<table x="499" y="1835" name="GruppoOfferte">
 <row name="destinatario" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="DestinatarioOfferta" row="id" />
@@ -82,7 +82,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1683" y="2023" name="Offerta">
+<table x="792" y="1994" name="Offerta">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -109,7 +109,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2011" y="1890" name="AgenteOfferta">
+<table x="1120" y="1861" name="AgenteOfferta">
 <row name="persona_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -120,7 +120,7 @@
 <part>persona_ptr</part>
 </key>
 </table>
-<table x="1863" y="2142" name="ParteEconomicaOfferta">
+<table x="972" y="2113" name="ParteEconomicaOfferta">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -137,7 +137,7 @@
 </key>
 <comment>Serve solo per fatturazioni trasversali</comment>
 </table>
-<table x="2583" y="2045" name="ModalitaLavoro">
+<table x="1692" y="2016" name="ModalitaLavoro">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -152,7 +152,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2228" y="2149" name="AtomoFatturabile">
+<table x="1337" y="2120" name="AtomoFatturabile">
 <row name="offerta_riferimento" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="Offerta" row="id" />
@@ -212,19 +212,19 @@
 <part>id</part>
 </key>
 </table>
-<table x="1929" y="1703" name="PersonaContattoAzienda">
-<row name="azienda" null="1" autoincrement="0">
+<table x="1241" y="636" name="PersonaContattoAzienda">
+<row name="personafisica_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="PersonaFisica" row="soggettocontattabile_ptr" />
 </row>
-<row name="persona_ptr" null="1" autoincrement="1">
+<row name="azienda" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>persona_ptr</part>
+<part>personafisica_ptr</part>
 </key>
 </table>
-<table x="1153" y="1868" name="TipologiaOfferta">
+<table x="273" y="1936" name="TipologiaOfferta">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -712,7 +712,7 @@
 <part>canaledidistribuzione_ptr</part>
 </key>
 </table>
-<table x="4218" y="460" name="FatturaElettronica">
+<table x="4798" y="443" name="FatturaElettronica">
 <row name="xml_fattura" null="0" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="XmlFatturaElettronica" row="id" />
@@ -774,7 +774,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1492" y="480" name="RegimeFiscale">
+<table x="2398" y="974" name="RegimeFiscale">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -788,7 +788,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3401" y="964" name="TipoCassa">
+<table x="3981" y="947" name="TipoCassa">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -802,7 +802,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3115" y="1056" name="ModalitaPagamento">
+<table x="3695" y="1039" name="ModalitaPagamento">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -816,7 +816,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4616" y="658" name="TipoDocumento">
+<table x="5196" y="641" name="TipoDocumento">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -830,7 +830,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3763" y="1320" name="Natura">
+<table x="4343" y="1303" name="Natura">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -844,7 +844,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3718" y="706" name="TipoRitenuta">
+<table x="4298" y="689" name="TipoRitenuta">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -858,7 +858,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3121" y="537" name="XmlFatturaElettronica">
+<table x="3701" y="520" name="XmlFatturaElettronica">
 <row name="soggetti_fattura_elettronica" null="0" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="SoggettiFatturaElettronica" row="id" />
@@ -876,7 +876,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2809" y="640" name="SoggettiFatturaElettronica">
+<table x="3289" y="553" name="SoggettiFatturaElettronica">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -886,7 +886,7 @@
 </row>
 <row name="contatto_cedente_prestatore" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="DatoDiContatto" row="id" />
+<default>NULL</default><relation table="VoceContattoRubrica" row="id" />
 </row>
 <row name="riferimento_amministrazione" null="1" autoincrement="0">
 <datatype>VARCHAR(20)</datatype>
@@ -919,15 +919,10 @@
 <part>id</part>
 </key>
 </table>
-<table x="1981" y="845" name="SoggettoFiscale">
-<row name="indirizzo_pec" null="1" autoincrement="0">
+<table x="2646" y="606" name="SoggettoFiscale">
+<row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="Pec" row="email_ptr" />
-</row>
-<row name="regime_fiscale" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default><relation table="RegimeFiscale" row="id" />
-</row>
+<default>NULL</default></row>
 <row name="codice_fiscale" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="PartitaIvaCF" row="id" />
@@ -940,41 +935,49 @@
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="CodiceDestinatario" row="id" />
 </row>
-<row name="sede_legale" null="0" autoincrement="0">
+<row name="dati_di_contatto" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default></row>
-<row name="stabile_organizzazione" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default></row>
-<row name="cod_eori" null="1" autoincrement="0">
-<datatype>VARCHAR(17)</datatype>
-<default>NULL</default></row>
-<row name="nazione" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default><relation table="Nazione" row="id" />
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
+<comment>one2one</comment>
+</row>
+<row name="indirizzo_pec" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Pec" row="email_ptr" />
 </row>
-<row name="numero_licenza_guida" null="1" autoincrement="0">
-<datatype>VARCHAR(20)</datatype>
-<default>NULL</default></row>
 <row name="iscrizione_rea" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="IscrizioneREA" row="id" />
 </row>
-<row name="id" null="1" autoincrement="1">
+<row name="nazione" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default></row>
-<row name="revisione_principale" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="Nazione" row="id" />
 </row>
+<row name="regime_fiscale" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="RegimeFiscale" row="id" />
+</row>
+<row name="stabile_organizzazione" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Indirizzo" row="contattorubrica_ptr" />
+</row>
+<row name="cod_eori" null="1" autoincrement="0">
+<datatype>VARCHAR(17)</datatype>
+<default>NULL</default></row>
+<row name="numero_licenza_guida" null="1" autoincrement="0">
+<datatype>VARCHAR(20)</datatype>
+<default>NULL</default></row>
 <row name="rimosso" null="1" autoincrement="0">
 <datatype>bit</datatype>
 <default>NULL</default></row>
+<row name="sede" null="0" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Indirizzo" row="contattorubrica_ptr" />
+</row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="1397" y="598" name="PartitaIvaCF">
+<table x="2914" y="482" name="PartitaIvaCF">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -985,7 +988,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="357" y="726" name="Nazione">
+<table x="559" y="767" name="Nazione">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -999,7 +1002,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3105" y="710" name="FormatoTrasmissione">
+<table x="3685" y="693" name="FormatoTrasmissione">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1013,7 +1016,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1335" y="716" name="CodiceDestinatario">
+<table x="2948" y="993" name="CodiceDestinatario">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1027,37 +1030,40 @@
 <part>id</part>
 </key>
 </table>
-<table x="2433" y="652" name="DatoDiContatto">
+<table x="2048" y="345" name="VoceContattoRubrica">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
-<row name="soggetto_fiscale" null="1" autoincrement="0">
+<row name="soggetto" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
 </row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="2507" y="346" name="Telefono">
-<row name="datodicontatto_ptr" null="1" autoincrement="1">
+<table x="1820" y="205" name="Telefono">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="DatoDiContatto" row="id" />
+<default>NULL</default><relation table="VoceContattoRubrica" row="id" />
 </row>
 <row name="numero" null="0" autoincrement="0">
 <datatype>VARCHAR(20)</datatype>
 <default>'NULL'</default></row>
+<row name="interno" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default></row>
 <row name="note" null="1" autoincrement="0">
 <datatype>VARCHAR(64)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>datodicontatto_ptr</part>
+<part>contattorubrica_ptr</part>
 </key>
 </table>
-<table x="2145" y="669" name="Email">
-<row name="datodicontatto_ptr" null="1" autoincrement="1">
+<table x="2050" y="220" name="Email">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="DatoDiContatto" row="id" />
+<default>NULL</default><relation table="VoceContattoRubrica" row="id" />
 </row>
 <row name="indirizzo" null="0" autoincrement="0">
 <datatype>VARCHAR(30)</datatype>
@@ -1066,10 +1072,10 @@
 <datatype>VARCHAR(64)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>datodicontatto_ptr</part>
+<part>contattorubrica_ptr</part>
 </key>
 </table>
-<table x="1748" y="1400" name="IscrizioneAlboProfessionale">
+<table x="2253" y="1296" name="IscrizioneAlboProfessionale">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1085,13 +1091,13 @@
 <default>NULL</default></row>
 <row name="persona_fisica" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="PersonaFisica" row="soggetto_fiscale_ptr" />
+<default>NULL</default><relation table="PersonaFisica" row="soggettocontattabile_ptr" />
 </row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="1304" y="1075" name="IscrizioneREA">
+<table x="2706" y="1072" name="IscrizioneREA">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1117,7 +1123,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1495" y="1199" name="SocioUnico">
+<table x="2526" y="1186" name="SocioUnico">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1131,7 +1137,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="1233" y="1259" name="StatoLiquidazione">
+<table x="2729" y="1276" name="StatoLiquidazione">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1145,7 +1151,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2437" y="1079" name="TerzoIntermediarioOSoggettoEmittente">
+<table x="3257" y="852" name="TerzoIntermediarioOSoggettoEmittente">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1161,7 +1167,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2843" y="943" name="SoggettoEmittente">
+<table x="3386" y="986" name="SoggettoEmittente">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1175,10 +1181,10 @@
 <part>id</part>
 </key>
 </table>
-<table x="2492" y="1705" name="PersonaFisica">
-<row name="soggetto_fiscale_ptr" null="1" autoincrement="1">
+<table x="1525" y="605" name="PersonaFisica">
+<row name="soggettocontattabile_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
 </row>
 <row name="titolo" null="1" autoincrement="0">
 <datatype>VARCHAR(10)</datatype>
@@ -1189,22 +1195,26 @@
 <row name="cognome" null="1" autoincrement="0">
 <datatype>VARCHAR(60)</datatype>
 <default>NULL</default></row>
+<row name="is_privato" null="1" autoincrement="0">
+<datatype>bit</datatype>
+<default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>soggetto_fiscale_ptr</part>
+<part>soggettocontattabile_ptr</part>
 </key>
 </table>
-<table x="1952" y="1243" name="PersonaGiuridica">
-<row name="soggetto_fiscale_ptr" null="1" autoincrement="1">
+<table x="1861" y="590" name="PersonaGiuridica">
+<row name="soggettocontattabile_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
 </row>
 <row name="denominazione" null="1" autoincrement="0">
 <datatype>VARCHAR(80)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
+<part>soggettocontattabile_ptr</part>
 </key>
 </table>
-<table x="1241" y="1421" name="AlboProfessionale">
+<table x="2626" y="1452" name="AlboProfessionale">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1219,7 +1229,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4510" y="39" name="Allegato">
+<table x="5090" y="22" name="Allegato">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1246,7 +1256,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3088" y="1192" name="DatoPagamento">
+<table x="3668" y="1175" name="DatoPagamento">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1296,7 +1306,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4198" y="884" name="DatiVeicoli">
+<table x="4778" y="867" name="DatiVeicoli">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1310,7 +1320,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="5053" y="592" name="DatiDocumentali">
+<table x="5633" y="575" name="DatiDocumentali">
 <row name="codici_documentali" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="CodiciDocumentali" row="id" />
@@ -1340,7 +1350,7 @@
 </key>
 <comment>DatiOrdineAcquisto, DatiContratto, DatiConvenzione, DatiRicezione</comment>
 </table>
-<table x="4662" y="376" name="DatiFattureCollegate">
+<table x="5242" y="359" name="DatiFattureCollegate">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1356,7 +1366,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4792" y="209" name="DatiSAL">
+<table x="5372" y="192" name="DatiSAL">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1371,7 +1381,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="5500" y="489" name="DatiDDT">
+<table x="6080" y="472" name="DatiDDT">
 <row name="dati_generali" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="FatturaElettronica" row="id" />
@@ -1389,14 +1399,14 @@
 <part>id</part>
 </key>
 </table>
-<table x="3078" y="0" name="DatiTrasporto">
+<table x="3572" y="36" name="DatiTrasporto">
 <row name="dati_generali" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="FatturaElettronica" row="id" />
 </row>
 <row name="indirizzo_resa" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="Indirizzo" row="id" />
+<default>NULL</default><relation table="Indirizzo" row="contattorubrica_ptr" />
 </row>
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
@@ -1441,7 +1451,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4626" y="768" name="Valuta">
+<table x="5206" y="751" name="Valuta">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1455,7 +1465,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3932" y="614" name="DatiRitenuta">
+<table x="4512" y="597" name="DatiRitenuta">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1477,7 +1487,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3670" y="814" name="CausalePagamento">
+<table x="4250" y="797" name="CausalePagamento">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1491,7 +1501,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4337" y="910" name="DatiBollo">
+<table x="4917" y="893" name="DatiBollo">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1502,7 +1512,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3573" y="951" name="DatiCassaPrevidenziale">
+<table x="4153" y="934" name="DatiCassaPrevidenziale">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1533,7 +1543,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3909" y="972" name="ScontoMaggiorazione">
+<table x="4489" y="955" name="ScontoMaggiorazione">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1551,7 +1561,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3900" y="1118" name="TipoScontoMaggiorazione">
+<table x="4480" y="1101" name="TipoScontoMaggiorazione">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1565,7 +1575,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3936" y="1276" name="AliquotaIva">
+<table x="4516" y="1259" name="AliquotaIva">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1583,7 +1593,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2633" y="1257" name="ContoBancario">
+<table x="3209" y="1123" name="ContoBancario">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1605,7 +1615,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2847" y="1332" name="IstitutoFinanziario">
+<table x="3427" y="1315" name="IstitutoFinanziario">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1625,7 +1635,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="2839" y="1195" name="DettaglioBancario">
+<table x="3419" y="1178" name="DettaglioBancario">
 <row name="conto_bancario" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="ContoBancario" row="id" />
@@ -1641,7 +1651,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3007" y="1610" name="CondizionePagamento">
+<table x="3587" y="1593" name="CondizionePagamento">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1655,7 +1665,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4377" y="1259" name="DettaglioLinee">
+<table x="4957" y="1242" name="DettaglioLinee">
 <row name="fattura_elettronica_body" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="FatturaElettronica" row="id" />
@@ -1689,7 +1699,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="5083" y="1233" name="altroDatoGestionale">
+<table x="5663" y="1216" name="altroDatoGestionale">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1713,7 +1723,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4989" y="1553" name="TipoCessionePrestazione">
+<table x="5569" y="1536" name="TipoCessionePrestazione">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1727,7 +1737,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="5100" y="1422" name="CodiceArticolo">
+<table x="5680" y="1405" name="CodiceArticolo">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1742,7 +1752,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="5280" y="1455" name="TipoCodiceArticolo">
+<table x="5860" y="1438" name="TipoCodiceArticolo">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1756,7 +1766,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4928" y="1393" name="ArticoloLinea">
+<table x="5508" y="1376" name="ArticoloLinea">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1772,7 +1782,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3543" y="1443" name="UnitaMisura">
+<table x="4152" y="1754" name="UnitaMisura">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1786,7 +1796,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="3286" y="182" name="TipoResa">
+<table x="3866" y="165" name="TipoResa">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1800,7 +1810,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="5736" y="688" name="RiferimentoDDTNumeroLinea">
+<table x="6316" y="671" name="RiferimentoDDTNumeroLinea">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1816,7 +1826,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4688" y="925" name="RiferimentoOrdineAcquistoNumeroLinea">
+<table x="5268" y="908" name="RiferimentoOrdineAcquistoNumeroLinea">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1832,7 +1842,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4949" y="360" name="CodiciDocumentali">
+<table x="5529" y="343" name="CodiciDocumentali">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1849,7 +1859,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="5321" y="640" name="TipologiaDocumentale">
+<table x="5901" y="623" name="TipologiaDocumentale">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -1863,7 +1873,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="4012" y="1635" name="OggettoDaFatturare">
+<table x="4416" y="1881" name="OggettoDaFatturare">
 <row name="unita_misura" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>NULL</default><relation table="UnitaMisura" row="id" />
@@ -1890,14 +1900,14 @@
 <part>id</part>
 </key>
 </table>
-<table x="1186" y="1663" name="Sede">
-<row name="inquilino" null="1" autoincrement="0">
-<datatype>INTEGER</datatype>
-<default>NULL</default><relation table="SoggettoFiscale" row="id" />
-</row>
+<table x="1434" y="259" name="Sede">
 <row name="indirizzo_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="Indirizzo" row="id" />
+<default>NULL</default><relation table="Indirizzo" row="contattorubrica_ptr" />
+</row>
+<row name="societa" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Societa" row="id" />
 </row>
 <row name="is_legale" null="1" autoincrement="0">
 <datatype>bit</datatype>
@@ -1906,10 +1916,10 @@
 <part>indirizzo_ptr</part>
 </key>
 </table>
-<table x="2235" y="493" name="Fax">
-<row name="datodicontatto_ptr" null="1" autoincrement="1">
+<table x="1823" y="349" name="Fax">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="DatoDiContatto" row="id" />
+<default>NULL</default><relation table="VoceContattoRubrica" row="id" />
 </row>
 <row name="numero" null="1" autoincrement="0">
 <datatype>VARCHAR(20)</datatype>
@@ -1918,19 +1928,19 @@
 <datatype>VARCHAR(64)</datatype>
 <default>NULL</default></row>
 <key type="PRIMARY" name="">
-<part>datodicontatto_ptr</part>
+<part>contattorubrica_ptr</part>
 </key>
 </table>
-<table x="1993" y="606" name="Pec">
+<table x="2098" y="148" name="Pec">
 <row name="email_ptr" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
-<default>NULL</default><relation table="Email" row="datodicontatto_ptr" />
+<default>NULL</default><relation table="Email" row="contattorubrica_ptr" />
 </row>
 <key type="PRIMARY" name="">
 <part>email_ptr</part>
 </key>
 </table>
-<table x="320" y="1112" name="Cap">
+<table x="51" y="494" name="Cap">
 <row name="codice" null="1" autoincrement="0">
 <datatype>VARCHAR(5)</datatype>
 <default>'None'</default></row>
@@ -1938,7 +1948,7 @@
 <part>codice</part>
 </key>
 </table>
-<table x="318" y="1210" name="Comune">
+<table x="87" y="678" name="Comune">
 <row name="id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>None</default></row>
@@ -1959,7 +1969,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="556" y="1105" name="ComuneCap">
+<table x="61" y="564" name="ComuneCap">
 <row name="id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>None</default></row>
@@ -1975,7 +1985,7 @@
 <part>id</part>
 </key>
 </table>
-<table x="0" y="1196" name="Dug">
+<table x="293" y="735" name="Dug">
 <row name="nome" null="1" autoincrement="0">
 <datatype>VARCHAR(40)</datatype>
 <default>'None'</default></row>
@@ -1983,7 +1993,7 @@
 <part>nome</part>
 </key>
 </table>
-<table x="123" y="1001" name="Indirizzo">
+<table x="301" y="470" name="AbstractIndirizzo">
 <row name="id" null="1" autoincrement="0">
 <datatype>INTEGER</datatype>
 <default>None</default></row>
@@ -2008,11 +2018,15 @@
 <datatype>VARCHAR(40)</datatype>
 <default>'None'</default><relation table="Dug" row="nome" />
 </row>
+<row name="nazione" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Nazione" row="id" />
+</row>
 <key type="PRIMARY" name="">
 <part>id</part>
 </key>
 </table>
-<table x="486" y="1280" name="Provincia">
+<table x="271" y="953" name="Provincia">
 <row name="sigla" null="1" autoincrement="0">
 <datatype>VARCHAR(2)</datatype>
 <default>'None'</default></row>
@@ -2027,7 +2041,7 @@
 <part>sigla</part>
 </key>
 </table>
-<table x="677" y="1364" name="Regione">
+<table x="75" y="894" name="Regione">
 <row name="nome" null="1" autoincrement="0">
 <datatype>VARCHAR(32)</datatype>
 <default>'None'</default></row>
@@ -2035,7 +2049,7 @@
 <part>nome</part>
 </key>
 </table>
-<table x="3444" y="2239" name="RicaviDaFattura">
+<table x="3507" y="2087" name="RicaviDaFattura">
 <row name="id" null="1" autoincrement="1">
 <datatype>INTEGER</datatype>
 <default>NULL</default></row>
@@ -2051,4 +2065,42 @@
 <part>id</part>
 </key>
 </table>
+<table x="1795" y="486" name="SoggettoContattabile">
+<row name="id" null="1" autoincrement="1">
+<datatype>INTEGER</datatype>
+<default>NULL</default></row>
+<key type="PRIMARY" name="">
+<part>id</part>
+</key>
+</table>
+<table x="2033" y="81" name="Indirizzo">
+<row name="contattorubrica_ptr" null="1" autoincrement="1">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="AbstractIndirizzo" row="id" />
+<relation table="VoceContattoRubrica" row="id" />
+</row>
+<key type="PRIMARY" name="">
+<part>contattorubrica_ptr</part>
+</key>
+<comment>&lt;AbstractIndirizzo&gt;</comment>
+</table>
+<table x="1288" y="415" name="Societa">
+<row name="id" null="1" autoincrement="1">
+<datatype>INTEGER</datatype>
+<default>NULL</default></row>
+<row name="nazione" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="Nazione" row="id" />
+</row>
+<row name="soggetto" null="1" autoincrement="0">
+<datatype>INTEGER</datatype>
+<default>NULL</default><relation table="SoggettoContattabile" row="id" />
+</row>
+<row name="ragione_sociale" null="1" autoincrement="0">
+<datatype>VARCHAR(1024)</datatype>
+<default>NULL</default></row>
+<key type="PRIMARY" name="">
+<part>id</part>
+</key>
+</table>
 </sql>