diff --git a/Directory.Build.props b/Directory.Build.props
index 9223f27..754cdf2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.806.0</VersionPrefix>
+    <VersionPrefix>3.900.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
index 258c0c2..001513d 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/Schemas/WhiteLabelingSettingsType.cs
@@ -1,10 +1,11 @@
 using GraphQL.Types;
 using VirtoCommerce.WhiteLabeling.ExperienceApi.Models;
+using VirtoCommerce.Xapi.Core.Schemas;
 using VirtoCommerce.XCMS.Core.Schemas;
 
 namespace VirtoCommerce.WhiteLabeling.ExperienceApi.Schemas
 {
-    public class WhiteLabelingSettingsType : ObjectGraphType<ExpWhiteLabelingSetting>
+    public class WhiteLabelingSettingsType : ExtendableGraphType<ExpWhiteLabelingSetting>
     {
         public WhiteLabelingSettingsType()
         {
@@ -15,8 +16,8 @@ public WhiteLabelingSettingsType()
             Field(x => x.LabelingSetting.SecondaryLogoUrl, nullable: true).Description("Logo URL for footer");
             Field(x => x.LabelingSetting.FaviconUrl, nullable: true).Description("Master favicon URL");
             Field(x => x.LabelingSetting.ThemePresetName, nullable: true).Description("Theme preset name");
-            Field<ListGraphType<MenuLinkType>>("footerLinks", resolve: context => context.Source.FooterLinks);
-            Field<ListGraphType<FaviconType>>("favicons", resolve: context => context.Source.Favicons);
+            Field<ListGraphType<MenuLinkType>>("footerLinks").Resolve(context => context.Source.FooterLinks);
+            Field<ListGraphType<FaviconType>>("favicons").Resolve(context => context.Source.Favicons);
         }
     }
 }
diff --git a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
index f8d96fb..103da39 100644
--- a/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
+++ b/src/VirtoCommerce.WhiteLabeling.ExperienceApi/VirtoCommerce.WhiteLabeling.ExperienceApi.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.FileExperienceApi.Data" Version="3.803.0" />
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.FileExperienceApi.Data" Version="3.900.0" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.900.0" />
+    <PackageReference Include="VirtoCommerce.XCMS.Core" Version="3.900.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.861.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.WhiteLabeling.Core\VirtoCommerce.WhiteLabeling.Core.csproj" />
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
index fb273ab..cadf64e 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
+++ b/src/VirtoCommerce.WhiteLabeling.Web/Module.cs
@@ -1,6 +1,6 @@
 using System;
-using GraphQL.Server;
-using MediatR;
+using GraphQL;
+using GraphQL.MicrosoftDI;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
@@ -21,7 +21,6 @@
 using VirtoCommerce.WhiteLabeling.ExperienceApi;
 using VirtoCommerce.WhiteLabeling.ExperienceApi.Authorization;
 using VirtoCommerce.Xapi.Core.Extensions;
-using VirtoCommerce.Xapi.Core.Infrastructure;
 
 namespace VirtoCommerce.WhiteLabeling.Web;
 
@@ -32,12 +31,10 @@ public class Module : IModule, IHasConfiguration
 
     public void Initialize(IServiceCollection serviceCollection)
     {
-        var assemblyMarker = typeof(AssemblyMarker);
-        var graphQlBuilder = new CustomGraphQLBuilder(serviceCollection);
-        graphQlBuilder.AddGraphTypes(assemblyMarker);
-        serviceCollection.AddMediatR(assemblyMarker);
-        serviceCollection.AddAutoMapper(assemblyMarker);
-        serviceCollection.AddSchemaBuilders(assemblyMarker);
+        _ = new GraphQLBuilder(serviceCollection, builder =>
+        {
+            builder.AddSchema(serviceCollection, typeof(AssemblyMarker));
+        });
 
         serviceCollection.AddDbContext<WhiteLabelingDbContext>(options =>
         {
diff --git a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
index 0f64269..6e0ebcd 100644
--- a/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
+++ b/src/VirtoCommerce.WhiteLabeling.Web/module.manifest
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.WhiteLabeling</id>
-  <version>3.806.0</version>
+  <version>3.900.0</version>
   <version-tag></version-tag>
 
-  <platformVersion>3.841.0</platformVersion>
+  <platformVersion>3.861.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.FileExperienceApi" version="3.803.0" />
-    <dependency id="VirtoCommerce.Xapi" version="3.800.0" />
-    <dependency id="VirtoCommerce.XCMS" version="3.800.0" />
+    <dependency id="VirtoCommerce.FileExperienceApi" version="3.900.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.900.0" />
+    <dependency id="VirtoCommerce.XCMS" version="3.900.0" />
     <dependency id="VirtoCommerce.Customer" version="3.811.0" />
     <dependency id="VirtoCommerce.ImageTools" version="3.802.0" />
   </dependencies>