diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 70c9558df3..a6e9cdadbe 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -477,7 +477,7 @@ class CompanySettings extends BaseSettings
 
     public $sync_invoice_quote_columns = true;
 
-    public $e_invoice_type = 'EN16931';
+    public $e_invoice_type = 'EN16931'; //verifactu
 
     public $e_quote_type = 'OrderX_Comfort';
 
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 83eb98c207..d79d9dcf40 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -80,6 +80,7 @@ use Illuminate\Contracts\Translation\HasLocalePreference;
  * @property int|null $updated_at
  * @property int|null $deleted_at
  * @property string|null $id_number
+ * @property string|null $classification
  * @property-read mixed $hashed_id
  * @property-read \App\Models\User|null $assigned_user
  * @property-read \App\Models\User $user
diff --git a/app/Services/EDocument/Standards/Validation/EntityLevelInterface.php b/app/Services/EDocument/Standards/Validation/EntityLevelInterface.php
new file mode 100644
index 0000000000..8b68114e2b
--- /dev/null
+++ b/app/Services/EDocument/Standards/Validation/EntityLevelInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2025. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Services\EDocument\Standards\Validation;
+
+use App\Models\Client;
+use App\Models\Company;
+use App\Models\Invoice;
+
+interface EntityLevelInterface
+{
+
+    public function checkClient(Client $client): array;
+
+    public function checkCompany(Company $company): array;
+
+    public function checkInvoice(Invoice $invoice): array;
+
+}
\ No newline at end of file
diff --git a/app/Services/EDocument/Standards/Validation/Peppol/EntityLevel.php b/app/Services/EDocument/Standards/Validation/Peppol/EntityLevel.php
index fbe6312b21..56634b9d3a 100644
--- a/app/Services/EDocument/Standards/Validation/Peppol/EntityLevel.php
+++ b/app/Services/EDocument/Standards/Validation/Peppol/EntityLevel.php
@@ -21,10 +21,11 @@ use App\Models\Invoice;
 use App\Models\PurchaseOrder;
 use App\Services\EDocument\Standards\Peppol;
 use App\Services\EDocument\Standards\Validation\XsltDocumentValidator;
+use App\Services\EDocument\Standards\Validation\EntityLevelInterface;
 use Illuminate\Support\Facades\App;
 use XSLTProcessor;
 
-class EntityLevel
+class EntityLevel implements EntityLevelInterface
 {
     private array $eu_country_codes = [
             'AT', // Austria
diff --git a/app/Services/EDocument/Standards/Validation/Verifactu/EntityLevel.php b/app/Services/EDocument/Standards/Validation/Verifactu/EntityLevel.php
new file mode 100644
index 0000000000..6f3767e4c7
--- /dev/null
+++ b/app/Services/EDocument/Standards/Validation/Verifactu/EntityLevel.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2025. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Services\EDocument\Standards\Validation\Verifactu;
+
+use App\Services\EDocument\Standards\Validation\EntityLevelInterface;
+use App\Models\Client;
+use App\Models\Company;
+use App\Models\Invoice;
+
+class EntityLevel implements EntityLevelInterface
+{
+    public function checkClient(Client $client): array
+    {
+        return [];
+    }
+
+    public function checkCompany(Company $company): array
+    {
+        return [];
+    }
+
+    public function checkInvoice(Invoice $invoice): array
+    {
+        return [];
+    }
+
+    private function testClientState(Client $client): array
+}
\ No newline at end of file
diff --git a/app/Services/EDocument/Standards/Verifactu/Validation/InvoiceValidator.php b/app/Services/EDocument/Standards/Validation/Verifactu/InvoiceValidator.php
similarity index 99%
rename from app/Services/EDocument/Standards/Verifactu/Validation/InvoiceValidator.php
rename to app/Services/EDocument/Standards/Validation/Verifactu/InvoiceValidator.php
index ac514e5467..ff785c923d 100644
--- a/app/Services/EDocument/Standards/Verifactu/Validation/InvoiceValidator.php
+++ b/app/Services/EDocument/Standards/Validation/Verifactu/InvoiceValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\EDocument\Standards\Verifactu\Validation;
+namespace App\Services\EDocument\Standards\Validation\Verifactu;
 
 use App\Services\EDocument\Standards\Verifactu\Models\Invoice;
 use InvalidArgumentException;