diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index d78071d71b16..a35cd1e63c02 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -513,7 +513,6 @@ class CompanySettings extends BaseSettings
         'delivery_note_design_id'            => 'string',
         'payment_receipt_design_id'          => 'string',
         'payment_refund_design_id'           => 'string',
-        'classification'                     => 'string',
         'enable_e_invoice'                   => 'bool',
         'classification'                     => 'string',
         'default_expense_payment_type_id'    => 'string',
diff --git a/app/DataMapper/EDoc/Fact1.php b/app/DataMapper/EDoc/Fact1.php
new file mode 100644
index 000000000000..b7b661bea4ec
--- /dev/null
+++ b/app/DataMapper/EDoc/Fact1.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\EDoc;
+
+use Spatie\LaravelData\Data;
+
+class Fact1 extends Data
+{
+    public string $sectorCode = 'SECTOR1';
+    public string $BankId = '';
+    public string $BankName = '';
+    public string $PaymentMeans = 'TP02';
+
+}
diff --git a/app/DataMapper/EDoc/FatturaPA.php b/app/DataMapper/EDoc/FatturaPA.php
new file mode 100644
index 000000000000..a3f3e557d087
--- /dev/null
+++ b/app/DataMapper/EDoc/FatturaPA.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\EDoc;
+
+use Spatie\LaravelData\Data;
+
+class FatturaPA extends Data
+{
+    public string $RegimeFiscale = 'RF01';
+    public string $TipoDocumento = 'TD01';
+    public string $ModalitaPagamento = 'MP01';
+    public string $CondizioniPagamento = 'TP02';
+
+}
diff --git a/app/DataMapper/EDocSettings.php b/app/DataMapper/EDocSettings.php
new file mode 100644
index 000000000000..40c2828dd4ba
--- /dev/null
+++ b/app/DataMapper/EDocSettings.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Optional;
+use App\DataMapper\EDoc\FatturaPA;
+
+class EDocSettings extends Data
+{
+    public FatturaPA|Optional $FatturaPA;
+
+    public function __construct() {}
+
+    public function createFatturaPA(): FatturaPA
+    {
+        return $this->FatturaPA ??= new FatturaPA();
+    }
+
+}
+
+
+
+class DatiAnagraficiVettore extends Data{
+
+    public string $IdFiscaleIVA = '';
+    public string $CodiceFiscale = '';
+    public string $Anagrafica = '';
+}
+
+class DatiTrasporto extends Data{
+    public string $DataOraConsegna = ''; //datetime in this format 2017-01-10T16:46:12.000+02:00
+    //public DatiAnagraficiVettore
+}
+
+class DatiOrdineAcquisto extends Data{
+    public string $RiferimentoNumeroLinea = '';
+    public string $IdDocumento = '';
+    public string $Data = '';
+    public string $NumItem = '';
+    public string $CodiceCommessaConvenzione = '';
+    public string $CodiceCUP = '';
+    public string $CodiceCIG = '';
+}
+
+class DatiContratto extends Data{
+    public string $RiferimentoNumeroLinea = '';
+    public string $IdDocumento = '';
+    public string $Data = '';
+    public string $NumItem = '';
+    public string $CodiceCommessaConvenzione = '';
+    public string $CodiceCUP = '';
+    public string $CodiceCIG = '';
+}
+
+class DatiRicezione extends Data{
+    public string $RiferimentoNumeroLinea = '';
+    public string $IdDocumento = '';
+    public string $Data = '';
+    public string $NumItem = '';
+    public string $CodiceCommessaConvenzione = '';
+    public string $CodiceCUP = '';
+    public string $CodiceCIG = '';
+}
\ No newline at end of file