diff --git a/src/Application/BlazingBudget.Application/Budgets/UpsertBudgets/UpsertBudgetHandler.cs b/src/Application/BlazingBudget.Application/Budgets/UpsertBudgets/UpsertBudgetHandler.cs
index b7d2b23..7a05254 100644
--- a/src/Application/BlazingBudget.Application/Budgets/UpsertBudgets/UpsertBudgetHandler.cs
+++ b/src/Application/BlazingBudget.Application/Budgets/UpsertBudgets/UpsertBudgetHandler.cs
@@ -1,5 +1,7 @@
 using BlazingBudget.Domain.Aggregates.Accounts;
 using BlazingBudget.Domain.Aggregates.Budgets;
+using BlazingBudget.Domain.Aggregates.Expenses;
+using BlazingBudget.Domain.Aggregates.Incomes;
 using BlazingBudget.Domain.ValueObjects;
 using BlazingBudget.Infrastructure.Persistence.EntityFramework;
 using BlazingBudget.Infrastructure.Persistence.Extensions;
diff --git a/src/Application/BlazingBudget.Application/Mapping/MapsterConfiguration.cs b/src/Application/BlazingBudget.Application/Mapping/MapsterConfiguration.cs
index 51fa577..8dd0247 100644
--- a/src/Application/BlazingBudget.Application/Mapping/MapsterConfiguration.cs
+++ b/src/Application/BlazingBudget.Application/Mapping/MapsterConfiguration.cs
@@ -1,6 +1,9 @@
 using BlazingBudget.Domain.Aggregates.Accounts;
 using BlazingBudget.Domain.Aggregates.Budgets;
 using BlazingBudget.Domain.Aggregates.Debts;
+using BlazingBudget.Domain.Aggregates.Expenses;
+using BlazingBudget.Domain.Aggregates.Incomes;
+using BlazingBudget.Domain.Aggregates.Payments;
 using Mapster;
 
 namespace BlazingBudget.Application.Mapping;
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Account.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Account.cs
index 61e9611..a4d33d1 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Account.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Account.cs
@@ -1,4 +1,6 @@
-namespace BlazingBudget.Domain.Aggregates.Accounts;
+using BlazingBudget.Domain.ValueObjects;
+
+namespace BlazingBudget.Domain.Aggregates.Accounts;
 public sealed class Account : Entity<AccountId>
 {
 	public PersonName Name { get; private set; }
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Email.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Email.cs
deleted file mode 100644
index cd445a2..0000000
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Email.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using CSharpFunctionalExtensions;
-using BlazingBudget.Domain.Common;
-
-namespace BlazingBudget.Domain.Aggregates.Accounts
-{
-    public class Email : ValueObject
-    {
-        public string Value { get; private set; }
-
-        public const int MaxLength = 256;
-
-        private Email() { }
-
-        [JsonConstructor]
-        private Email(string value)
-        {
-            Value = value;
-        }
-
-        public static Result<Email> Create(string input)
-        {
-            // TODO: How do we reuse these validation rules?
-
-            if (string.IsNullOrWhiteSpace(input))
-                return Result.Failure<Email>(Messages.Strings.ValueIsRequired);
-
-            string email = input.Trim();
-
-            if (email.Length > MaxLength)
-                return Result.Failure<Email>(Messages.Strings.ValueIsTooLong);
-
-            if (!Regex.IsMatch(email, @"^(.+)@(.+)$"))
-                return Result.Failure<Email>(Messages.Strings.ValueIsInvalid);
-
-            return Result.Success(new Email(email));
-        }
-
-        protected override IEnumerable<IComparable> GetEqualityComponents()
-        {
-            yield return Value;
-        }
-    }
-}
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Password.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Password.cs
deleted file mode 100644
index a71d560..0000000
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/Password.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using CSharpFunctionalExtensions;
-
-namespace BlazingBudget.Domain.Aggregates.Accounts;
-
-    public class Password : ValueObject
-    {
-        public string Value { get; private set; }
-
-        private Password() { }
-
-        [JsonConstructor]
-        private Password(string value)
-        {
-            Value = value;
-        }
-
-        public static Result<Password> Create(string value)
-        {
-            if (Regex.Match(value, "(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])(?=.{8,})").Success == false)
-            {
-                return Result.Failure<Password>("The password does not meet the required strength.");
-            }
-
-            return Result.Success(new Password(value));
-        }
-
-	protected override IEnumerable<object> GetEqualityComponents()
-	{
-		yield return Value;
-	}
-}
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Budget.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Budget.cs
index b56b871..1340f6c 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Budget.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Budget.cs
@@ -1,4 +1,6 @@
 using BlazingBudget.Domain.Aggregates.Accounts;
+using BlazingBudget.Domain.Aggregates.Expenses;
+using BlazingBudget.Domain.Aggregates.Incomes;
 
 namespace BlazingBudget.Domain.Aggregates.Budgets;
 public sealed class Budget : Entity<BudgetId>
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/BudgetCalculator.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/BudgetCalculator.cs
index 5e677e8..f5f8b89 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/BudgetCalculator.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/BudgetCalculator.cs
@@ -1,3 +1,4 @@
+using BlazingBudget.Domain.Aggregates.Expenses;
 using CSharpFunctionalExtensions;
 
 namespace BlazingBudget.Domain.Aggregates.Budgets
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/ExpenseId.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/ExpenseId.cs
deleted file mode 100644
index 67d88c7..0000000
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/ExpenseId.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using StronglyTypedIds;
-
-namespace BlazingBudget.Domain.Aggregates.Budgets;
-/// <summary>
-/// Income unique identifier.
-/// </summary>
-[StronglyTypedId]
-public readonly partial struct ExpenseId { }
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/ExpensePaymentCreated.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/ExpensePaymentCreated.cs
index 3125187..94997e1 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/ExpensePaymentCreated.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/ExpensePaymentCreated.cs
@@ -1,9 +1,6 @@
-using BlazingBudget.Domain.ValueObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BlazingBudget.Domain.Aggregates.Expenses;
+using BlazingBudget.Domain.Aggregates.Payments;
+using BlazingBudget.Domain.ValueObjects;
 
 namespace BlazingBudget.Domain.Aggregates.Budgets
 {
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Payment.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Payment.cs
deleted file mode 100644
index 6fd2336..0000000
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Payment.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using BlazingBudget.Domain.ValueObjects;
-
-namespace BlazingBudget.Domain.Aggregates.Budgets
-{
-    /// <summary>
-    /// {BudgetPlan}Payment is an entity because the amount of a payment over time affects long term finances.
-    /// </summary>
-    public class Payment : AuditableEntity<PaymentId>
-    {
-        private Payment() { }
-
-        [JsonConstructor]
-        private Payment(PaymentId id, Money amount, string notes)
-        {
-            Id = id;
-            Amount = amount;
-            Notes = notes;
-            CreatedOn = DateTime.UtcNow;
-            ModifiedOn = CreatedOn;
-        }
-
-        public static Payment Create(Money amount, string notes = "")
-        {
-            return new Payment(new PaymentId(Guid.NewGuid()), amount, notes);
-        }
-
-        public void ChangeAmount(Money amount)
-        {
-            Amount = amount;
-        }
-
-        public void ChangeNotes(string notes)
-        {
-            Notes = notes;
-        }
-
-        public Money Amount { get; private set; }
-
-        public string Notes { get; set; } = string.Empty;
-    }
-}
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/PaymentId.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/PaymentId.cs
deleted file mode 100644
index 63a855b..0000000
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/PaymentId.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using StronglyTypedIds;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlazingBudget.Domain.Aggregates.Budgets;
-/// <summary>
-/// Payment unique identifier.
-/// </summary>
-[StronglyTypedId]
-public readonly partial struct PaymentId { }
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/Debt.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Debts/Debt.cs
index ac66883..d8479ac 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/Debt.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Debts/Debt.cs
@@ -1,4 +1,4 @@
-using BlazingBudget.Domain.Aggregates.Budgets;
+using BlazingBudget.Domain.Aggregates.Payments;
 using BlazingBudget.Domain.ValueObjects;
 using CSharpFunctionalExtensions;
 
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/DebtPaymentCreatedEvent.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Debts/DebtPaymentCreatedEvent.cs
index e3ace25..0409fdf 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/DebtPaymentCreatedEvent.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Debts/DebtPaymentCreatedEvent.cs
@@ -1,10 +1,5 @@
-using BlazingBudget.Domain.Aggregates.Budgets;
+using BlazingBudget.Domain.Aggregates.Payments;
 using BlazingBudget.Domain.ValueObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BlazingBudget.Domain.Aggregates.Debts
 {
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Expenses/.gitkeep b/src/Domain/BlazingBudget.Domain/Aggregates/Expenses/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Expense.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Expenses/Expense.cs
similarity index 85%
rename from src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Expense.cs
rename to src/Domain/BlazingBudget.Domain/Aggregates/Expenses/Expense.cs
index f89f63b..0078cbd 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Expense.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Expenses/Expense.cs
@@ -1,7 +1,8 @@
-using BlazingBudget.Domain.Abstractions;
+using BlazingBudget.Domain.Abstractions;
+using BlazingBudget.Domain.Aggregates.Payments;
 using BlazingBudget.Domain.ValueObjects;
 
-namespace BlazingBudget.Domain.Aggregates.Budgets;
+namespace BlazingBudget.Domain.Aggregates.Expenses;
 public class Expense : AuditableEntity<ExpenseId>
 {
 	private Expense() { }
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Expenses/ExpenseId.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Expenses/ExpenseId.cs
new file mode 100644
index 0000000..37390e2
--- /dev/null
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Expenses/ExpenseId.cs
@@ -0,0 +1,8 @@
+using StronglyTypedIds;
+
+namespace BlazingBudget.Domain.Aggregates.Expenses;
+/// <summary>
+/// Expense unique identifier.
+/// </summary>
+[StronglyTypedId]
+public readonly partial struct ExpenseId { }
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Incomes/.gitkeep b/src/Domain/BlazingBudget.Domain/Aggregates/Incomes/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Income.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Incomes/Income.cs
similarity index 89%
rename from src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Income.cs
rename to src/Domain/BlazingBudget.Domain/Aggregates/Incomes/Income.cs
index 5c8846c..b150700 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/Income.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Incomes/Income.cs
@@ -1,7 +1,7 @@
-using BlazingBudget.Domain.Abstractions;
+using BlazingBudget.Domain.Abstractions;
 using BlazingBudget.Domain.ValueObjects;
 
-namespace BlazingBudget.Domain.Aggregates.Budgets;
+namespace BlazingBudget.Domain.Aggregates.Incomes;
 /// <summary>
 /// {BudgetPlan}Income is an entity because the amount of a payment over time affects long term finances.
 /// </summary>
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/IncomeId.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Incomes/IncomeId.cs
similarity index 61%
rename from src/Domain/BlazingBudget.Domain/Aggregates/Budgets/IncomeId.cs
rename to src/Domain/BlazingBudget.Domain/Aggregates/Incomes/IncomeId.cs
index 856aafc..dfe0424 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Budgets/IncomeId.cs
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Incomes/IncomeId.cs
@@ -1,6 +1,6 @@
-using StronglyTypedIds;
+using StronglyTypedIds;
 
-namespace BlazingBudget.Domain.Aggregates.Budgets;
+namespace BlazingBudget.Domain.Aggregates.Incomes;
 /// <summary>
 /// Income unique identifier.
 /// </summary>
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Payments/.gitkeep b/src/Domain/BlazingBudget.Domain/Aggregates/Payments/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Payments/Payment.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Payments/Payment.cs
new file mode 100644
index 0000000..1a4d44b
--- /dev/null
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Payments/Payment.cs
@@ -0,0 +1,39 @@
+using BlazingBudget.Domain.ValueObjects;
+
+namespace BlazingBudget.Domain.Aggregates.Payments;
+/// <summary>
+/// {BudgetPlan}Payment is an entity because the amount of a payment over time affects long term finances.
+/// </summary>
+public class Payment : AuditableEntity<PaymentId>
+{
+    private Payment() { }
+
+    [JsonConstructor]
+    private Payment(PaymentId id, Money amount, string notes)
+    {
+        Id = id;
+        Amount = amount;
+        Notes = notes;
+        CreatedOn = DateTime.UtcNow;
+        ModifiedOn = CreatedOn;
+    }
+
+    public static Payment Create(Money amount, string notes = "")
+    {
+        return new Payment(new PaymentId(Guid.NewGuid()), amount, notes);
+    }
+
+    public void ChangeAmount(Money amount)
+    {
+        Amount = amount;
+    }
+
+    public void ChangeNotes(string notes)
+    {
+        Notes = notes;
+    }
+
+    public Money Amount { get; private set; }
+
+    public string Notes { get; set; } = string.Empty;
+}
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Payments/PaymentId.cs b/src/Domain/BlazingBudget.Domain/Aggregates/Payments/PaymentId.cs
new file mode 100644
index 0000000..ba4e6ab
--- /dev/null
+++ b/src/Domain/BlazingBudget.Domain/Aggregates/Payments/PaymentId.cs
@@ -0,0 +1,8 @@
+using StronglyTypedIds;
+
+namespace BlazingBudget.Domain.Aggregates.Payments;
+/// <summary>
+/// Payment unique identifier.
+/// </summary>
+[StronglyTypedId]
+public readonly partial struct PaymentId { }
diff --git a/src/Domain/BlazingBudget.Domain/ValueObjects/Email.cs b/src/Domain/BlazingBudget.Domain/ValueObjects/Email.cs
new file mode 100644
index 0000000..b12ad7d
--- /dev/null
+++ b/src/Domain/BlazingBudget.Domain/ValueObjects/Email.cs
@@ -0,0 +1,42 @@
+using CSharpFunctionalExtensions;
+using BlazingBudget.Domain.Common;
+
+namespace BlazingBudget.Domain.ValueObjects;
+
+public class Email : ValueObject
+{
+    public string Value { get; private set; }
+
+    public const int MaxLength = 256;
+
+    private Email() { }
+
+    [JsonConstructor]
+    private Email(string value)
+    {
+        Value = value;
+    }
+
+    public static Result<Email> Create(string input)
+    {
+        // TODO: How do we reuse these validation rules?
+
+        if (string.IsNullOrWhiteSpace(input))
+            return Result.Failure<Email>(Messages.Strings.ValueIsRequired);
+
+        string email = input.Trim();
+
+        if (email.Length > MaxLength)
+            return Result.Failure<Email>(Messages.Strings.ValueIsTooLong);
+
+        if (!Regex.IsMatch(email, @"^(.+)@(.+)$"))
+            return Result.Failure<Email>(Messages.Strings.ValueIsInvalid);
+
+        return Result.Success(new Email(email));
+    }
+
+    protected override IEnumerable<IComparable> GetEqualityComponents()
+    {
+        yield return Value;
+    }
+}
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/MoneyOwed.cs b/src/Domain/BlazingBudget.Domain/ValueObjects/MoneyOwed.cs
similarity index 95%
rename from src/Domain/BlazingBudget.Domain/Aggregates/Debts/MoneyOwed.cs
rename to src/Domain/BlazingBudget.Domain/ValueObjects/MoneyOwed.cs
index 7e88b87..d468f14 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/MoneyOwed.cs
+++ b/src/Domain/BlazingBudget.Domain/ValueObjects/MoneyOwed.cs
@@ -1,7 +1,7 @@
 using CSharpFunctionalExtensions;
 using BlazingBudget.Domain.ValueObjects;
 
-namespace BlazingBudget.Domain.Aggregates.Debts;
+namespace BlazingBudget.Domain.ValueObjects;
 /// <summary>
 /// Money owed is an amount of money still left to pay.
 /// </summary>
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/MoneyPaid.cs b/src/Domain/BlazingBudget.Domain/ValueObjects/MoneyPaid.cs
similarity index 95%
rename from src/Domain/BlazingBudget.Domain/Aggregates/Debts/MoneyPaid.cs
rename to src/Domain/BlazingBudget.Domain/ValueObjects/MoneyPaid.cs
index feda7c3..6cdf1c5 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Debts/MoneyPaid.cs
+++ b/src/Domain/BlazingBudget.Domain/ValueObjects/MoneyPaid.cs
@@ -1,6 +1,6 @@
 using BlazingBudget.Domain.ValueObjects;
 
-namespace BlazingBudget.Domain.Aggregates.Debts;
+namespace BlazingBudget.Domain.ValueObjects;
 /// <summary>
 /// Money paid is an amount of money paid.
 /// </summary>
diff --git a/src/Domain/BlazingBudget.Domain/ValueObjects/Password.cs b/src/Domain/BlazingBudget.Domain/ValueObjects/Password.cs
new file mode 100644
index 0000000..0291eb9
--- /dev/null
+++ b/src/Domain/BlazingBudget.Domain/ValueObjects/Password.cs
@@ -0,0 +1,31 @@
+using CSharpFunctionalExtensions;
+
+namespace BlazingBudget.Domain.ValueObjects;
+
+public class Password : ValueObject
+{
+    public string Value { get; private set; }
+
+    private Password() { }
+
+    [JsonConstructor]
+    private Password(string value)
+    {
+        Value = value;
+    }
+
+    public static Result<Password> Create(string value)
+    {
+        if (Regex.Match(value, "(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])(?=.{8,})").Success == false)
+        {
+            return Result.Failure<Password>("The password does not meet the required strength.");
+        }
+
+        return Result.Success(new Password(value));
+    }
+
+	protected override IEnumerable<object> GetEqualityComponents()
+	{
+		yield return Value;
+	}
+}
diff --git a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/PersonName.cs b/src/Domain/BlazingBudget.Domain/ValueObjects/PersonName.cs
similarity index 95%
rename from src/Domain/BlazingBudget.Domain/Aggregates/Accounts/PersonName.cs
rename to src/Domain/BlazingBudget.Domain/ValueObjects/PersonName.cs
index 5a24e90..d0d6faf 100644
--- a/src/Domain/BlazingBudget.Domain/Aggregates/Accounts/PersonName.cs
+++ b/src/Domain/BlazingBudget.Domain/ValueObjects/PersonName.cs
@@ -1,6 +1,6 @@
 using CSharpFunctionalExtensions;
 
-namespace BlazingBudget.Domain.Aggregates.Accounts;
+namespace BlazingBudget.Domain.ValueObjects;
 public class PersonName : ValueObject
 {
     public string FirstName { get; private set; }
diff --git a/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/EntityFramework/BudgetContext.cs b/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/EntityFramework/BudgetContext.cs
index d9434d5..8126abe 100644
--- a/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/EntityFramework/BudgetContext.cs
+++ b/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/EntityFramework/BudgetContext.cs
@@ -1,6 +1,9 @@
 using BlazingBudget.Domain.Aggregates.Accounts;
 using BlazingBudget.Domain.Aggregates.Budgets;
 using BlazingBudget.Domain.Aggregates.Debts;
+using BlazingBudget.Domain.Aggregates.Expenses;
+using BlazingBudget.Domain.Aggregates.Incomes;
+using BlazingBudget.Domain.Aggregates.Payments;
 using BlazingBudget.Domain.ValueObjects;
 using BlazingBudget.Infrastructure.Persistence.ValueConverters;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/ValueConverters/StronglyTypedIdConverters.cs b/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/ValueConverters/StronglyTypedIdConverters.cs
index 303d8b9..a7d7f47 100644
--- a/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/ValueConverters/StronglyTypedIdConverters.cs
+++ b/src/Infrastructure/BlazingBudget.Infrastructure/Persistence/ValueConverters/StronglyTypedIdConverters.cs
@@ -1,6 +1,9 @@
 using BlazingBudget.Domain.Aggregates.Accounts;
 using BlazingBudget.Domain.Aggregates.Budgets;
 using BlazingBudget.Domain.Aggregates.Debts;
+using BlazingBudget.Domain.Aggregates.Expenses;
+using BlazingBudget.Domain.Aggregates.Incomes;
+using BlazingBudget.Domain.Aggregates.Payments;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace BlazingBudget.Infrastructure.Persistence.ValueConverters;
diff --git a/tests/BlazingBudget.Application.Tests/BudgetModelTests.cs b/tests/BlazingBudget.Application.Tests/BudgetModelTests.cs
index ff37261..9169ba0 100644
--- a/tests/BlazingBudget.Application.Tests/BudgetModelTests.cs
+++ b/tests/BlazingBudget.Application.Tests/BudgetModelTests.cs
@@ -2,6 +2,8 @@
 using BlazingBudget.Application.Mapping;
 using BlazingBudget.Domain.Aggregates.Accounts;
 using BlazingBudget.Domain.Aggregates.Budgets;
+using BlazingBudget.Domain.Aggregates.Expenses;
+using BlazingBudget.Domain.Aggregates.Incomes;
 using BlazingBudget.Domain.ValueObjects;
 using Mapster;