diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php
new file mode 100644
index 000000000000..979ab3f07b74
--- /dev/null
+++ b/app/DataMapper/Tax/BaseRule.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Tax;
+
+use App\Models\Client;
+use App\Models\Product;
+use App\DataMapper\Tax\RuleInterface;
+use App\DataMapper\Tax\ZipTax\Response;
+
+class BaseRule implements RuleInterface
+{
+
+    /** EU TAXES */
+
+    public array $distance_selling_thresholds = [
+        "AT" => 35000,
+        "BE" => 35000,
+        "BG" => 35800,
+        "HR" => 35900,
+        "CY" => 0, // Cyprus does not have a distance selling threshold, so for cyprus buyers and sellers always use this rate
+        "CZ" => 44200,
+        "DK" => 37500,
+        "EE" => 35000,
+        "FI" => 35000,
+        "FR" => 35000,
+        "DE" => 100000,
+        "GR" => 35000,
+        "HU" => 25000,
+        "IE" => 35000,
+        "IT" => 35000,
+        "LV" => 35000,
+        "LT" => 35000,
+        "LU" => 100000,
+        "MT" => 35000,
+        "NL" => 100000,
+        "PL" => 36900,
+        "PT" => 35000,
+        "RO" => 24200,
+        "SK" => 35000,
+        "SI" => 35000,
+        "ES" => 35000,
+        "SE" => 31700
+    ];
+
+    public float $vat_rate = 19;
+    public float $vat_threshold = 10000;
+    public float $vat_reduced_rate = 7;
+    public float $vat_reduced_threshold = 10000;
+    public float $at_vat_rate = 20; // Austria
+    public float $be_vat_rate = 21; // Belgium
+    public float $bg_vat_rate = 20; // Bulgaria
+    public float $hr_vat_rate = 25; // Croatia
+    public float $cy_vat_rate = 19; // Cyprus
+    public float $cz_vat_rate = 21; // Czech Republic
+    public float $dk_vat_rate = 25; // Denmark
+    public float $ee_vat_rate = 20; // Estonia
+    public float $fi_vat_rate = 24; // Finland
+    public float $fr_vat_rate = 20; // France
+    public float $de_vat_rate = 19; // Germany
+    public float $gr_vat_rate = 24; // Greece
+    public float $hu_vat_rate = 27; // Hungary
+    public float $ie_vat_rate = 23; // Ireland
+    public float $it_vat_rate = 22; // Italy
+    public float $lv_vat_rate = 21; // Latvia
+    public float $lt_vat_rate = 21; // Lithuania
+    public float $lu_vat_rate = 17; // Luxembourg
+    public float $mt_vat_rate = 18; // Malta
+    public float $nl_vat_rate = 21; // Netherlands
+    public float $pl_vat_rate = 23; // Poland
+    public float $pt_vat_rate = 23; // Portugal
+    public float $ro_vat_rate = 19; // Romania
+    public float $sk_vat_rate = 20; // Slovakia
+    public float $si_vat_rate = 22; // Slovenia
+    public float $es_vat_rate = 21; // Spain
+    public float $se_vat_rate = 25; // Sweden
+    public float $gb_vat_rate = 20; // United Kingdom
+    public bool $consumer_tax_exempt = false;
+    public bool $business_tax_exempt = true;
+    public bool $eu_business_tax_exempt = true;
+    public bool $foreign_business_tax_exempt = true;
+    public bool $foreign_consumer_tax_exempt = true;
+/** EU TAXES */
+
+
+/** US TAXES */
+    public float $al_sales_tax_rate = 4; // Alabama
+    public float $ak_sales_tax_rate = 0; // Alaska
+    public float $az_sales_tax_rate = 5.6; // Arizona
+    public float $ar_sales_tax_rate = 6.5; // Arkansas
+    public float $ca_sales_tax_rate = 7.25; // California - https://services.maps.cdtfa.ca.gov/api/taxrate/GetRateByAddress?address=2444+s+alameda+st&city=los+angeles&zip=90058
+    public float $co_sales_tax_rate = 2.9; // Colorado
+    public float $ct_sales_tax_rate = 6.35; // Connecticut
+    public float $de_sales_tax_rate = 0; // Delaware
+    public float $fl_sales_tax_rate = 6; // Florida
+    public float $ga_sales_tax_rate = 4; // Georgia
+    public float $hi_sales_tax_rate = 4; // Hawaii
+    public float $id_sales_tax_rate = 6; // Idaho
+    public float $il_sales_tax_rate = 6.25; // Illinois
+    public float $in_sales_tax_rate = 7; // Indiana
+    public float $ia_sales_tax_rate = 6; // Iowa
+    public float $ks_sales_tax_rate = 6.5; // Kansas
+    public float $ky_sales_tax_rate = 6; // Kentucky
+    public float $la_sales_tax_rate = 4.45; // Louisiana
+    public float $me_sales_tax_rate = 5.5; // Maine
+    public float $md_sales_tax_rate = 6; // Maryland
+    public float $ma_sales_tax_rate = 6.25; // Massachusetts
+    public float $mi_sales_tax_rate = 6; // Michigan
+    public float $mn_sales_tax_rate = 6.875; // Minnesota
+    public float $ms_sales_tax_rate = 7; // Mississippi
+    public float $mo_sales_tax_rate = 4.225; // Missouri
+    public float $mt_sales_tax_rate = 0; // Montana
+    public float $ne_sales_tax_rate = 5.5; // Nebraska
+    public float $nv_sales_tax_rate = 6.85; // Nevada
+    public float $nh_sales_tax_rate = 0; // New Hampshire
+    public float $nj_sales_tax_rate = 6.625; // New Jersey
+    public float $nm_sales_tax_rate = 5.125; // New Mexico
+    public float $ny_sales_tax_rate = 4; // New York
+    public float $nc_sales_tax_rate = 4.75; // North Carolina
+    public float $nd_sales_tax_rate = 5; // North Dakota
+    public float $oh_sales_tax_rate = 5.75; // Ohio
+    public float $ok_sales_tax_rate = 4.5; // Oklahoma
+    public float $or_sales_tax_rate = 0; // Oregon
+    public float $pa_sales_tax_rate = 6; // Pennsylvania
+    public float $ri_sales_tax_rate = 7; // Rhode Island
+    public float $sc_sales_tax_rate = 6; // South Carolina
+    public float $sd_sales_tax_rate = 4.5; // South Dakota
+    public float $tn_sales_tax_rate = 7; // Tennessee
+    public float $tx_sales_tax_rate = 6.25; // Texas
+    public float $ut_sales_tax_rate = 4.7; // Utah
+    public float $vt_sales_tax_rate = 6; // Vermont
+    public float $va_sales_tax_rate = 5.3; // Virginia
+    public float $wa_sales_tax_rate = 6.5; // Washington
+    public float $wv_sales_tax_rate = 6; // West Virginia
+    public float $wi_sales_tax_rate = 5; // Wisconsin
+    public float $wy_sales_tax_rate = 4; // Wyoming
+    public float $dc_sales_tax_rate = 6; // District of Columbia
+    public float $pr_sales_tax_rate = 11.5; // Puerto Rico
+/**US TAXES */
+
+
+    public string $tax_name1 = '';
+    public float $tax_rate1 = 0;
+
+    public string $tax_name2 = '';
+    public float $tax_rate2 = 0;
+
+    public string $tax_name3 = '';
+    public float $tax_rate3 = 0;
+
+    protected ?Client $client;
+
+    protected ?Response $tax_data;
+
+    public function __construct()
+    {
+    }
+
+    public function setClient(Client $client): self
+    {
+        $this->client = $client;
+
+        return $this;
+    }
+
+    public function setTaxData(Response $tax_data): self
+    {
+        $this->tax_data = $tax_data;
+
+        return $this;
+    }
+
+    //need to add logic here to capture if
+    public function tax(): self
+    {
+        if ($this->client->is_tax_exempt || $this->client->has_valid_vat_number) {
+            return $this->taxExempt();
+        }
+
+        $this->tax_name1 = $this->vat_rate;
+        $this->tax_rate1 = "VAT";
+
+        return $this;
+    }
+
+    public function taxByType(?int $product_tax_type): self
+    {
+        if ($this->client->is_tax_exempt) {
+            return $this->taxExempt();
+        }
+
+        if (!$product_tax_type) {
+            return $this;
+        }
+
+        match ($product_tax_type) {
+            Product::PRODUCT_TAX_EXEMPT => $this->taxExempt(),
+            Product::PRODUCT_TYPE_DIGITAL => $this->taxDigital(),
+            Product::PRODUCT_TYPE_SERVICE => $this->taxService(),
+            Product::PRODUCT_TYPE_SHIPPING => $this->taxShipping(),
+            Product::PRODUCT_TYPE_PHYSICAL => $this->taxPhysical(),
+            Product::PRODUCT_TYPE_REDUCED_TAX => $this->taxReduced(),
+            default => $this->default(),
+        };
+
+        return $this;
+    }
+
+    public function taxReduced(): self
+    {
+        $this->tax_rate1 = $this->vat_reduced_rate;
+        $this->tax_name1 = 'Reduced VAT';
+
+        return $this;
+    }
+
+    public function taxExempt(): self
+    {
+        $this->tax_name1 = '';
+        $this->tax_rate1 = 0;
+
+        return $this;
+    }
+
+    public function taxDigital(): self
+    {
+        $this->tax();
+
+        return $this;
+    }
+
+    public function taxService(): self
+    {
+        $this->tax();
+
+        return $this;
+    }
+
+    public function taxShipping(): self
+    {
+        $this->tax();
+
+        return $this;
+    }
+
+    public function taxPhysical(): self
+    {
+        $this->tax();
+
+        return $this;
+    }
+
+    public function default(): self
+    {
+        $this->tax_name1 = '';
+        $this->tax_rate1 = 0;
+
+        return $this;
+    }
+}
diff --git a/app/DataMapper/Tax/de/Rule.php b/app/DataMapper/Tax/de/Rule.php
index 134063121979..1717a46eed77 100644
--- a/app/DataMapper/Tax/de/Rule.php
+++ b/app/DataMapper/Tax/de/Rule.php
@@ -13,106 +13,21 @@ namespace App\DataMapper\Tax\de;
 
 use App\Models\Client;
 use App\Models\Product;
+use App\DataMapper\Tax\BaseRule;
 use App\DataMapper\Tax\RuleInterface;
 use App\DataMapper\Tax\ZipTax\Response;
 
-class Rule implements RuleInterface
+class Rule extends BaseRule implements RuleInterface
 {
+
     public float $vat_rate = 19;
 
     public float $vat_threshold = 10000;
 
-
-    public array $distance_selling_thresholds = [
-        "AT" => 35000,
-        "BE" => 35000,
-        "BG" => 35800,
-        "HR" => 35900,
-        "CY" => 0, // Cyprus does not have a distance selling threshold, so for cyprus buyers and sellers always use this rate
-        "CZ" => 44200,
-        "DK" => 37500,
-        "EE" => 35000,
-        "FI" => 35000,
-        "FR" => 35000,
-        "DE" => 100000,
-        "GR" => 35000,
-        "HU" => 25000,
-        "IE" => 35000,
-        "IT" => 35000,
-        "LV" => 35000,
-        "LT" => 35000,
-        "LU" => 100000,
-        "MT" => 35000,
-        "NL" => 100000,
-        "PL" => 36900,
-        "PT" => 35000,
-        "RO" => 24200,
-        "SK" => 35000,
-        "SI" => 35000,
-        "ES" => 35000,
-        "SE" => 31700
-    ];
-
     public float $vat_reduced_rate = 7;
 
     public float $vat_reduced_threshold = 10000;
 
-    public float $at_vat_rate = 20; // Austria
-    
-    public float $be_vat_rate = 21; // Belgium
-    
-    public float $bg_vat_rate = 20; // Bulgaria
-    
-    public float $hr_vat_rate = 25; // Croatia
-    
-    public float $cy_vat_rate = 19; // Cyprus
-    
-    public float $cz_vat_rate = 21; // Czech Republic
-    
-    public float $dk_vat_rate = 25; // Denmark
-    
-    public float $ee_vat_rate = 20; // Estonia
-    
-    public float $fi_vat_rate = 24; // Finland
-    
-    public float $fr_vat_rate = 20; // France
-    
-    public float $de_vat_rate = 19; // Germany
-    
-    public float $gr_vat_rate = 24; // Greece
-    
-    public float $hu_vat_rate = 27; // Hungary
-    
-    public float $ie_vat_rate = 23; // Ireland
-    
-    public float $it_vat_rate = 22; // Italy
-    
-    public float $lv_vat_rate = 21; // Latvia
-    
-    public float $lt_vat_rate = 21; // Lithuania
-    
-    public float $lu_vat_rate = 17; // Luxembourg
-    
-    public float $mt_vat_rate = 18; // Malta
-    
-    public float $nl_vat_rate = 21; // Netherlands
-    
-    public float $pl_vat_rate = 23; // Poland
-    
-    public float $pt_vat_rate = 23; // Portugal
-    
-    public float $ro_vat_rate = 19; // Romania
-    
-    public float $sk_vat_rate = 20; // Slovakia
-    
-    public float $si_vat_rate = 22; // Slovenia
-    
-    public float $es_vat_rate = 21; // Spain
-    
-    public float $se_vat_rate = 25; // Sweden
-    
-    public float $gb_vat_rate = 20; // United Kingdom
-
     public bool $consumer_tax_exempt = false;
 
     public bool $business_tax_exempt = true;
diff --git a/app/DataMapper/Tax/us/Rule.php b/app/DataMapper/Tax/us/Rule.php
index 370ac0c3da82..bc90457d5495 100644
--- a/app/DataMapper/Tax/us/Rule.php
+++ b/app/DataMapper/Tax/us/Rule.php
@@ -19,59 +19,6 @@ use App\DataMapper\Tax\ZipTax\Response;
 class Rule implements RuleInterface
 {
 
-    public float $al_sales_tax_rate = 4; // Alabama
-    public float $ak_sales_tax_rate = 0; // Alaska
-    public float $az_sales_tax_rate = 5.6; // Arizona
-    public float $ar_sales_tax_rate = 6.5; // Arkansas
-    public float $ca_sales_tax_rate = 7.25; // California - https://services.maps.cdtfa.ca.gov/api/taxrate/GetRateByAddress?address=2444+s+alameda+st&city=los+angeles&zip=90058
-    public float $co_sales_tax_rate = 2.9; // Colorado
-    public float $ct_sales_tax_rate = 6.35; // Connecticut
-    public float $de_sales_tax_rate = 0; // Delaware
-    public float $fl_sales_tax_rate = 6; // Florida
-    public float $ga_sales_tax_rate = 4; // Georgia
-    public float $hi_sales_tax_rate = 4; // Hawaii
-    public float $id_sales_tax_rate = 6; // Idaho
-    public float $il_sales_tax_rate = 6.25; // Illinois
-    public float $in_sales_tax_rate = 7; // Indiana
-    public float $ia_sales_tax_rate = 6; // Iowa
-    public float $ks_sales_tax_rate = 6.5; // Kansas
-    public float $ky_sales_tax_rate = 6; // Kentucky
-    public float $la_sales_tax_rate = 4.45; // Louisiana
-    public float $me_sales_tax_rate = 5.5; // Maine
-    public float $md_sales_tax_rate = 6; // Maryland
-    public float $ma_sales_tax_rate = 6.25; // Massachusetts
-    public float $mi_sales_tax_rate = 6; // Michigan
-    public float $mn_sales_tax_rate = 6.875; // Minnesota
-    public float $ms_sales_tax_rate = 7; // Mississippi
-    public float $mo_sales_tax_rate = 4.225; // Missouri
-    public float $mt_sales_tax_rate = 0; // Montana
-    public float $ne_sales_tax_rate = 5.5; // Nebraska
-    public float $nv_sales_tax_rate = 6.85; // Nevada
-    public float $nh_sales_tax_rate = 0; // New Hampshire
-    public float $nj_sales_tax_rate = 6.625; // New Jersey
-    public float $nm_sales_tax_rate = 5.125; // New Mexico
-    public float $ny_sales_tax_rate = 4; // New York
-    public float $nc_sales_tax_rate = 4.75; // North Carolina
-    public float $nd_sales_tax_rate = 5; // North Dakota
-    public float $oh_sales_tax_rate = 5.75; // Ohio
-    public float $ok_sales_tax_rate = 4.5; // Oklahoma
-    public float $or_sales_tax_rate = 0; // Oregon
-    public float $pa_sales_tax_rate = 6; // Pennsylvania
-    public float $ri_sales_tax_rate = 7; // Rhode Island
-    public float $sc_sales_tax_rate = 6; // South Carolina
-    public float $sd_sales_tax_rate = 4.5; // South Dakota
-    public float $tn_sales_tax_rate = 7; // Tennessee
-    public float $tx_sales_tax_rate = 6.25; // Texas
-    public float $ut_sales_tax_rate = 4.7; // Utah
-    public float $vt_sales_tax_rate = 6; // Vermont
-    public float $va_sales_tax_rate = 5.3; // Virginia
-    public float $wa_sales_tax_rate = 6.5; // Washington
-    public float $wv_sales_tax_rate = 6; // West Virginia
-    public float $wi_sales_tax_rate = 5; // Wisconsin
-    public float $wy_sales_tax_rate = 4; // Wyoming
-    public float $dc_sales_tax_rate = 6; // District of Columbia
-    public float $pr_sales_tax_rate = 11.5; // Puerto Rico
-
     public string $tax_name1 = '';
     public float $tax_rate1 = 0;
 
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 3388c4ad4c3b..c53205edc817 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -150,6 +150,10 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankIntegration> $bank_integrations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
  * @mixin \Eloquent
  */
 class Account extends BaseModel
diff --git a/app/Models/BankAccount.php b/app/Models/BankAccount.php
index 48b0c78b462f..89fd1c51e4fa 100644
--- a/app/Models/BankAccount.php
+++ b/app/Models/BankAccount.php
@@ -37,6 +37,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankSubaccount> $bank_subaccounts
  * @mixin \Eloquent
  */
 class BankAccount extends BaseModel
diff --git a/app/Models/BankIntegration.php b/app/Models/BankIntegration.php
index d9fb837ee06f..ab6087e2b27d 100644
--- a/app/Models/BankIntegration.php
+++ b/app/Models/BankIntegration.php
@@ -80,6 +80,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
  * @mixin \Eloquent
  */
 class BankIntegration extends BaseModel
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 8da22191e69f..7d3b8b0c4bee 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -257,6 +257,23 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoice> $recurring_invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_logs
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $gateway_tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $primary_contact
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Project> $projects
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringExpense> $recurring_expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoice> $recurring_invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_logs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
  * @mixin \Eloquent
  */
 class Client extends BaseModel implements HasLocalePreference
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index 19f3b6728c73..976a5e0e5062 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -148,6 +148,11 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $quote_invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $recurring_invoice_invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $credit_invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invoice_invitations
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $quote_invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $recurring_invoice_invitations
  * @mixin \Eloquent
  */
 class ClientContact extends Authenticatable implements HasLocalePreference
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 9719f26a95f9..3e97194ae6e8 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -508,6 +508,50 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Vendor> $vendors
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Webhook> $webhooks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $all_activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $all_documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankIntegration> $bank_integrations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransactionRule> $bank_transaction_rules
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $bank_transactions
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $client_contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyGateway> $company_gateways
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Design> $designs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ExpenseCategory> $expense_categories
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\GroupSetting> $group_settings
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\GroupSetting> $groups
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentTerm> $payment_terms
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Product> $products
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Project> $projects
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrder> $purchase_orders
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringExpense> $recurring_expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoice> $recurring_invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Scheduler> $schedulers
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Subscription> $subscriptions
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_log_relation
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\SystemLog> $system_logs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Scheduler> $task_schedulers
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\TaskStatus> $task_statuses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\TaxRate> $tax_rates
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens_hashed
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Design> $user_designs
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentTerm> $user_payment_terms
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Vendor> $vendors
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Webhook> $webhooks
  * @mixin \Eloquent
  */
 class Company extends BaseModel
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 1b69207ac9e2..3d0f48dcffb0 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -97,6 +97,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
  * @mixin \Eloquent
  */
 class CompanyGateway extends BaseModel
diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php
index 510093daec2b..d2470281a7df 100644
--- a/app/Models/CompanyUser.php
+++ b/app/Models/CompanyUser.php
@@ -82,6 +82,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $token
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $token
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\User> $users
  * @mixin \Eloquent
  */
 class CompanyUser extends Pivot
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index e42dd8b9d80a..c0d8a93202be 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -220,6 +220,13 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CreditInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @mixin \Eloquent
  */
 class Credit extends BaseModel
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index 27e1bcb12a74..4408b452473f 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -135,6 +135,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Expense extends BaseModel
diff --git a/app/Models/GatewayType.php b/app/Models/GatewayType.php
index 8e4dc24489df..2d0095d81a1b 100644
--- a/app/Models/GatewayType.php
+++ b/app/Models/GatewayType.php
@@ -33,6 +33,7 @@ namespace App\Models;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PaymentType> $payment_methods
  * @mixin \Eloquent
  */
 class GatewayType extends StaticModel
diff --git a/app/Models/GroupSetting.php b/app/Models/GroupSetting.php
index 637d8978e35d..8a3a1c016981 100644
--- a/app/Models/GroupSetting.php
+++ b/app/Models/GroupSetting.php
@@ -64,6 +64,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class GroupSetting extends StaticModel
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 8b12ee6003e7..ea53537d276b 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -250,6 +250,15 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Expense> $expenses
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\InvoiceInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
  * @mixin \Eloquent
  */
 class Invoice extends BaseModel
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index de69ef695fe1..f5bd60ca39be 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -157,6 +157,11 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Paymentable> $paymentables
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyLedger> $company_ledger
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Credit> $credits
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Paymentable> $paymentables
  * @mixin \Eloquent
  */
 class Payment extends BaseModel
diff --git a/app/Models/Product.php b/app/Models/Product.php
index 117178af997b..f196f80c436d 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -103,6 +103,7 @@ use League\CommonMark\CommonMarkConverter;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Product extends BaseModel
diff --git a/app/Models/Project.php b/app/Models/Project.php
index c8690fd0aa6c..87374eff9925 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -82,6 +82,8 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Task> $tasks
  * @mixin \Eloquent
  */
 class Project extends BaseModel
diff --git a/app/Models/Proposal.php b/app/Models/Proposal.php
index 5c79ce24d415..2b8e68a085ab 100644
--- a/app/Models/Proposal.php
+++ b/app/Models/Proposal.php
@@ -33,6 +33,7 @@ use App\Utils\Traits\MakesHash;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Proposal extends BaseModel
diff --git a/app/Models/PurchaseOrder.php b/app/Models/PurchaseOrder.php
index 32ec9d325945..64a8f37c440f 100644
--- a/app/Models/PurchaseOrder.php
+++ b/app/Models/PurchaseOrder.php
@@ -210,6 +210,12 @@ use Illuminate\Support\Facades\Storage;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @mixin \Eloquent
  */
 class PurchaseOrder extends BaseModel
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index d263490a0836..fedf67c0a0b1 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -201,6 +201,10 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\QuoteInvitation> $invitations
  * @mixin \Eloquent
  */
 class Quote extends BaseModel
diff --git a/app/Models/RecurringExpense.php b/app/Models/RecurringExpense.php
index 02fad06b4f11..cc77cda53cb8 100644
--- a/app/Models/RecurringExpense.php
+++ b/app/Models/RecurringExpense.php
@@ -144,6 +144,7 @@ use Illuminate\Support\Carbon;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class RecurringExpense extends BaseModel
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 3c0d1a533283..57d72525b39f 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -204,6 +204,11 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringInvoiceInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Invoice> $invoices
  * @mixin \Eloquent
  */
 class RecurringInvoice extends BaseModel
diff --git a/app/Models/RecurringQuote.php b/app/Models/RecurringQuote.php
index 025ff3b22b3c..4b7085afc083 100644
--- a/app/Models/RecurringQuote.php
+++ b/app/Models/RecurringQuote.php
@@ -196,6 +196,11 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringQuoteInvitation> $invitations
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Backup> $history
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\RecurringQuoteInvitation> $invitations
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Quote> $quotes
  * @mixin \Eloquent
  */
 class RecurringQuote extends BaseModel
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 6f17f5c2d272..d0b8669ea792 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -96,6 +96,7 @@ use Illuminate\Support\Carbon;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @mixin \Eloquent
  */
 class Task extends BaseModel
diff --git a/app/Models/User.php b/app/Models/User.php
index 96661a9779e0..1cd305b22ef5 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -174,6 +174,13 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Client> $clients
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Company> $companies
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyUser> $company_users
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\CompanyToken> $tokens
  * @mixin \Eloquent
  */
 class User extends Authenticatable implements MustVerifyEmail
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index b169d3efb72d..363995acf8e3 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -124,6 +124,10 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $contacts
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $primary_contact
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $contacts
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Document> $documents
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\VendorContact> $primary_contact
  * @mixin \Eloquent
  */
 class Vendor extends BaseModel
diff --git a/app/Models/VendorContact.php b/app/Models/VendorContact.php
index cc2110929c9b..0e70270b19fd 100644
--- a/app/Models/VendorContact.php
+++ b/app/Models/VendorContact.php
@@ -120,6 +120,8 @@ use Laracasts\Presenter\PresentableTrait;
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $purchase_order_invitations
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $purchase_order_invitations
+ * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\PurchaseOrderInvitation> $purchase_order_invitations
  * @mixin \Eloquent
  */
 class VendorContact extends Authenticatable implements HasLocalePreference