diff --git a/FruitBank.Common/Dtos/GenericAttributeDto.cs b/FruitBank.Common/Dtos/GenericAttributeDto.cs
index 252cf1b4..a80e1b0b 100644
--- a/FruitBank.Common/Dtos/GenericAttributeDto.cs
+++ b/FruitBank.Common/Dtos/GenericAttributeDto.cs
@@ -1,7 +1,10 @@
 using Mango.Nop.Core.Dtos;
+using Nop.Core.Domain.Common;
 
 namespace FruitBank.Common.Dtos;
 
+[LinqToDB.Mapping.Table(Name = nameof(GenericAttribute))]
+[System.ComponentModel.DataAnnotations.Schema.Table(nameof(GenericAttribute))]
 public class GenericAttributeDto : MgGenericAttributeDto
 {
     
diff --git a/FruitBank.Common/Dtos/OrderDto.cs b/FruitBank.Common/Dtos/OrderDto.cs
index c19a2b7f..082753ac 100644
--- a/FruitBank.Common/Dtos/OrderDto.cs
+++ b/FruitBank.Common/Dtos/OrderDto.cs
@@ -20,6 +20,8 @@ using System.Linq.Expressions;
 
 namespace FruitBank.Common.Dtos;
 
+[LinqToDB.Mapping.Table(Name = nameof(Order))]
+[System.ComponentModel.DataAnnotations.Schema.Table(nameof(Order))]
 public class OrderDto : MgOrderDto<OrderItemDto, ProductDto>, IOrderDto
 {
     [NotColumn, NotMapped, JsonIgnore, System.Text.Json.Serialization.JsonIgnore]
diff --git a/FruitBank.Common/Dtos/OrderItemDto.cs b/FruitBank.Common/Dtos/OrderItemDto.cs
index 59fb1d5a..ad9ff693 100644
--- a/FruitBank.Common/Dtos/OrderItemDto.cs
+++ b/FruitBank.Common/Dtos/OrderItemDto.cs
@@ -14,6 +14,8 @@ using System.Linq.Expressions;
 
 namespace FruitBank.Common.Dtos;
 
+[LinqToDB.Mapping.Table(Name = nameof(OrderItem))]
+[System.ComponentModel.DataAnnotations.Schema.Table(nameof(OrderItem))]
 public class OrderItemDto : MgOrderItemDto<ProductDto>, IOrderItemDto
 {
     [NotColumn, NotMapped, JsonIgnore, System.Text.Json.Serialization.JsonIgnore]
diff --git a/FruitBank.Common/Dtos/ProductDto.cs b/FruitBank.Common/Dtos/ProductDto.cs
index fe1eda6f..69582c59 100644
--- a/FruitBank.Common/Dtos/ProductDto.cs
+++ b/FruitBank.Common/Dtos/ProductDto.cs
@@ -11,6 +11,8 @@ using System.Linq.Expressions;
 
 namespace FruitBank.Common.Dtos;
 
+[LinqToDB.Mapping.Table(Name = "Product")]
+[System.ComponentModel.DataAnnotations.Schema.Table("Product")]
 public class ProductDto : MgProductDto, IProductDto
 {
     [NotColumn, NotMapped, JsonIgnore, System.Text.Json.Serialization.JsonIgnore]
diff --git a/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs b/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs
index fbfb79ae..7d4821ee 100644
--- a/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs
+++ b/FruitBank.Common/Dtos/StockQuantityHistoryDto.cs
@@ -14,6 +14,8 @@ using System.Threading.Tasks;
 
 namespace FruitBank.Common.Dtos
 {
+    [LinqToDB.Mapping.Table(Name = nameof(StockQuantityHistory))]
+    [System.ComponentModel.DataAnnotations.Schema.Table(nameof(StockQuantityHistory))]
     public class StockQuantityHistoryDto : MgStockQuantityHistoryDto<ProductDto>, IStockQuantityHistoryDto
     {
         [NotColumn, NotMapped, JsonIgnore, System.Text.Json.Serialization.JsonIgnore]
diff --git a/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj b/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj
index 4d6aea97..c778ae20 100644
--- a/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj
+++ b/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj
@@ -20,15 +20,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Core\AyCode.Core.csproj" />
 		<ProjectReference Include="..\FruitBank.Common\FruitBank.Common.csproj" />
 		<ProjectReference Include="..\FruitBankHybrid.Shared.Common\FruitBankHybrid.Shared.Common.csproj" />
 		<ProjectReference Include="..\FruitBankHybrid.Shared\FruitBankHybrid.Shared.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<Reference Include="AyCode.Core">
-			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Core.dll</HintPath>
-		</Reference>
 		<Reference Include="AyCode.Entities">
 			<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Entities.dll</HintPath>
 		</Reference>