diff --git a/src/api/FinancialHub.sln b/src/api/FinancialHub.sln
index 340348f72..0a44ba446 100644
--- a/src/api/FinancialHub.sln
+++ b/src/api/FinancialHub.sln
@@ -48,6 +48,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FinancialHub.Core.Infra", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FinancialHub.Core.Infra.Tests", "..\..\tests\core\FinancialHub.Core.Infra.Tests\FinancialHub.Core.Infra.Tests.csproj", "{5D9FE20B-524A-48D8-ACE1-7C114D9E01A4}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching", "Caching", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinancialHub.Core.Infra.Caching", "core\FinancialHub.Core.Infra.Caching\FinancialHub.Core.Infra.Caching.csproj", "{04C778A3-6BB8-BD1A-2433-5CF9FD8AC114}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinancialHub.Core.Infra.Caching.Tests", "..\..\tests\core\FinancialHub.Core.Infra.Caching.Tests\FinancialHub.Core.Infra.Caching.Tests.csproj", "{035C43ED-B37E-5337-9385-AFE7B5710F22}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logs", "Logs", "{60CCA40B-9B90-42D8-8AF7-C60044D9AC6C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinancialHub.Core.Infra.Logs", "core\FinancialHub.Core.Infra.Logs\FinancialHub.Core.Infra.Logs.csproj", "{95E64DD6-DC4A-B3B0-6C64-97A5A37FC77F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resources", "Resources", "{1594BC9B-4407-466A-9808-13A2587A458C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FinancialHub.Core.Resources", "core\FinancialHub.Core.Resources\FinancialHub.Core.Resources.csproj", "{BA997B88-BFE9-50C0-B14F-DE5999A5B1D5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -106,6 +120,22 @@ Global
 		{5D9FE20B-524A-48D8-ACE1-7C114D9E01A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D9FE20B-524A-48D8-ACE1-7C114D9E01A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D9FE20B-524A-48D8-ACE1-7C114D9E01A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04C778A3-6BB8-BD1A-2433-5CF9FD8AC114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04C778A3-6BB8-BD1A-2433-5CF9FD8AC114}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04C778A3-6BB8-BD1A-2433-5CF9FD8AC114}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04C778A3-6BB8-BD1A-2433-5CF9FD8AC114}.Release|Any CPU.Build.0 = Release|Any CPU
+		{035C43ED-B37E-5337-9385-AFE7B5710F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{035C43ED-B37E-5337-9385-AFE7B5710F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{035C43ED-B37E-5337-9385-AFE7B5710F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{035C43ED-B37E-5337-9385-AFE7B5710F22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95E64DD6-DC4A-B3B0-6C64-97A5A37FC77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95E64DD6-DC4A-B3B0-6C64-97A5A37FC77F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95E64DD6-DC4A-B3B0-6C64-97A5A37FC77F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95E64DD6-DC4A-B3B0-6C64-97A5A37FC77F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA997B88-BFE9-50C0-B14F-DE5999A5B1D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA997B88-BFE9-50C0-B14F-DE5999A5B1D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA997B88-BFE9-50C0-B14F-DE5999A5B1D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA997B88-BFE9-50C0-B14F-DE5999A5B1D5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -129,6 +159,13 @@ Global
 		{AC293685-7094-4325-8D5B-4ED252C62942} = {BEE32E30-21CF-489B-B208-3D053E4966A8}
 		{945AF69F-6D9F-4ECF-9AA1-6D96A4C94372} = {15C0C14F-DA06-46BB-A8B0-4BA5D6372777}
 		{5D9FE20B-524A-48D8-ACE1-7C114D9E01A4} = {15C0C14F-DA06-46BB-A8B0-4BA5D6372777}
+		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {15C0C14F-DA06-46BB-A8B0-4BA5D6372777}
+		{04C778A3-6BB8-BD1A-2433-5CF9FD8AC114} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{035C43ED-B37E-5337-9385-AFE7B5710F22} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{60CCA40B-9B90-42D8-8AF7-C60044D9AC6C} = {15C0C14F-DA06-46BB-A8B0-4BA5D6372777}
+		{95E64DD6-DC4A-B3B0-6C64-97A5A37FC77F} = {60CCA40B-9B90-42D8-8AF7-C60044D9AC6C}
+		{1594BC9B-4407-466A-9808-13A2587A458C} = {BEE32E30-21CF-489B-B208-3D053E4966A8}
+		{BA997B88-BFE9-50C0-B14F-DE5999A5B1D5} = {1594BC9B-4407-466A-9808-13A2587A458C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9A4C4A77-82DC-47E2-AA98-E741B329A3E8}
diff --git a/src/api/core/FinancialHub.Core.Domain/Entities/AccountEntity.cs b/src/api/core/FinancialHub.Core.Domain/Entities/AccountEntity.cs
index b15c0109f..7b28cad14 100644
--- a/src/api/core/FinancialHub.Core.Domain/Entities/AccountEntity.cs
+++ b/src/api/core/FinancialHub.Core.Domain/Entities/AccountEntity.cs
@@ -3,7 +3,7 @@
     public class AccountEntity : BaseEntity
     {
         public string Name { get; set; }
-        public string Description { get; set; }
+        public string? Description { get; set; }
         public bool IsActive { get; set; }
 
         public ICollection<BalanceEntity> Balances { get; set; }
diff --git a/src/api/core/FinancialHub.Core.Domain/Entities/CategoryEntity.cs b/src/api/core/FinancialHub.Core.Domain/Entities/CategoryEntity.cs
index 57504eefa..66e24cefe 100644
--- a/src/api/core/FinancialHub.Core.Domain/Entities/CategoryEntity.cs
+++ b/src/api/core/FinancialHub.Core.Domain/Entities/CategoryEntity.cs
@@ -3,7 +3,7 @@
     public class CategoryEntity : BaseEntity
     {
         public string Name { get; set; }
-        public string Description { get; set; }
+        public string? Description { get; set; }
         public bool IsActive { get; set; }
 
         public ICollection<TransactionEntity> Transactions { get; set; }
diff --git a/src/api/core/FinancialHub.Core.Domain/Entities/TransactionEntity.cs b/src/api/core/FinancialHub.Core.Domain/Entities/TransactionEntity.cs
index 3289b422d..a2e403165 100644
--- a/src/api/core/FinancialHub.Core.Domain/Entities/TransactionEntity.cs
+++ b/src/api/core/FinancialHub.Core.Domain/Entities/TransactionEntity.cs
@@ -4,7 +4,7 @@ namespace FinancialHub.Core.Domain.Entities
 {
     public class TransactionEntity : BaseEntity
     {
-        public string Description { get; set; }
+        public string? Description { get; set; }
         public decimal Amount { get; set; }
 
         public DateTimeOffset TargetDate { get; set; }