diff --git a/Directory.Build.props b/Directory.Build.props
index 96a0461..46bd0f8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,11 +2,11 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.404.0</VersionPrefix>
+    <VersionPrefix>3.800.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj
index 976f7e9..2aaa1da 100644
--- a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj
+++ b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Project is not a test project -->
     <SonarQubeTestProject>false</SonarQubeTestProject>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.400.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.800.0" />
   </ItemGroup>
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj
index da01abb..dd2117e 100644
--- a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj
@@ -1,18 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <noWarn>NU5104</noWarn>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.ReturnModule.Data\VirtoCommerce.ReturnModule.Data.csproj" />
-        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj b/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj
index 3ef0c2f..d7ea643 100644
--- a/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj
@@ -1,19 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.ReturnModule.Data\VirtoCommerce.ReturnModule.Data.csproj" />
-        <PackageReference Include="Npgsql" Version="6.0.0" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+    <PackageReference Include="Npgsql" Version="8.0.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj b/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj
index 454293c..1683a5e 100644
--- a/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.ReturnModule.Data\VirtoCommerce.ReturnModule.Data.csproj" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs b/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs
index 063205c..23d3f48 100644
--- a/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs
+++ b/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs
@@ -2,10 +2,11 @@
 using EntityFrameworkCore.Triggers;
 using Microsoft.EntityFrameworkCore;
 using VirtoCommerce.ReturnModule.Data.Models;
+using VirtoCommerce.Platform.Data.Infrastructure;
 
 namespace VirtoCommerce.ReturnModule.Data.Repositories
 {
-    public class ReturnDbContext : DbContextWithTriggers
+    public class ReturnDbContext : DbContextBase
     {
         public ReturnDbContext(DbContextOptions<ReturnDbContext> options)
           : base(options)
diff --git a/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs b/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs
index 44251d5..f938488 100644
--- a/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs
+++ b/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs
@@ -133,7 +133,7 @@ private async Task EnsureEachReturnHasNumber(IEnumerable<Return> returns)
                 if (ordersById.TryGetValue(orderReturn.OrderId, out var order) &&
                     storesById.TryGetValue(order.StoreId, out var store))
                 {
-                    numberTemplate = store.Settings.GetSettingValue(settingDescriptor.Name, numberTemplate);
+                    numberTemplate = store.Settings.GetValue<string>(settingDescriptor);
                 }
 
                 orderReturn.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate);
diff --git a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj
index e8002cf..0a955bc 100644
--- a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Project is not a test project -->
@@ -10,12 +10,12 @@
     <ProjectReference Include="..\VirtoCommerce.ReturnModule.Core\VirtoCommerce.ReturnModule.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.13">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.400.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj b/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj
index 6a0f4ca..7ffccd9 100644
--- a/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj
+++ b/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
@@ -14,4 +14,4 @@
     <ProjectReference Include="..\VirtoCommerce.ReturnModule.Data.SqlServer\VirtoCommerce.ReturnModule.Data.SqlServer.csproj" />
     <ProjectReference Include="..\VirtoCommerce.ReturnModule.Data\VirtoCommerce.ReturnModule.Data.csproj" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Web/module.manifest b/src/VirtoCommerce.ReturnModule.Web/module.manifest
index 87be657..644c6ca 100644
--- a/src/VirtoCommerce.ReturnModule.Web/module.manifest
+++ b/src/VirtoCommerce.ReturnModule.Web/module.manifest
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <id>VirtoCommerce.Return</id>
-  <version>3.404.0</version>
+  <version>3.800.0</version>
   <version-tag />
-  <platformVersion>3.400.0</platformVersion>
+
+  <platformVersion>3.800.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Orders" version="3.400.0" />
-    <dependency id="VirtoCommerce.Store" version="3.400.0" />
+    <dependency id="VirtoCommerce.Orders" version="3.800.0" />
+    <dependency id="VirtoCommerce.Store" version="3.800.0" />
   </dependencies>
+
   <title>Return module</title>
   <description>Return module</description>
   <authors>
@@ -19,9 +21,9 @@
   </owners>
   <requireLicenseAcceptance>false</requireLicenseAcceptance>
   <releaseNotes>First version.</releaseNotes>
-  <copyright>Copyright © 2022–2023 VirtoCommerce. All rights reserved</copyright>
+  <copyright>Copyright © 2011-2024 Virto Commerce. All rights reserved</copyright>
   <tags>extension module</tags>
   <assemblyFile>VirtoCommerce.ReturnModule.Web.dll</assemblyFile>
   <moduleType>VirtoCommerce.ReturnModule.Web.Module, VirtoCommerce.ReturnModule.Web</moduleType>
   <useFullTypeNameInSwagger>false</useFullTypeNameInSwagger>
-</module>
\ No newline at end of file
+</module>
diff --git a/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj b/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj
index 15023b3..f98ece4 100644
--- a/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj
+++ b/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <PropertyGroup>
@@ -12,13 +12,13 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.ReturnModule.Core\VirtoCommerce.ReturnModule.Core.csproj" />
     <ProjectReference Include="..\..\src\VirtoCommerce.ReturnModule.Data\VirtoCommerce.ReturnModule.Data.csproj" />
     <ProjectReference Include="..\..\src\VirtoCommerce.ReturnModule.Web\VirtoCommerce.ReturnModule.Web.csproj" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file