diff --git a/src/VirtoCommerce.XCart.Core/Schemas/WishlistScopeType.cs b/src/VirtoCommerce.XCart.Core/Schemas/WishlistScopeType.cs
index 429a7f6..87970ca 100644
--- a/src/VirtoCommerce.XCart.Core/Schemas/WishlistScopeType.cs
+++ b/src/VirtoCommerce.XCart.Core/Schemas/WishlistScopeType.cs
@@ -6,8 +6,8 @@ public class WishlistScopeType : EnumerationGraphType
     {
         public WishlistScopeType()
         {
-            Add(ModuleConstants.PrivateScope, value: ModuleConstants.PrivateScope, description: "Private scope");
-            Add(ModuleConstants.OrganizationScope, value: ModuleConstants.OrganizationScope, description: "Organization scope");
+            AddValue(ModuleConstants.PrivateScope, value: ModuleConstants.PrivateScope, description: "Private scope");
+            AddValue(ModuleConstants.OrganizationScope, value: ModuleConstants.OrganizationScope, description: "Organization scope");
         }
     }
 }
diff --git a/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj b/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj
index dc99229..e70ca11 100644
--- a/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj
+++ b/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj
@@ -10,8 +10,8 @@
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.10.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.816.2" />
-    <PackageReference Include="VirtoCommerce.XCatalog.Core" Version="3.820.1" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.815.0" />
+    <PackageReference Include="VirtoCommerce.XCatalog.Core" Version="3.818.0" />
     <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.822.0" />
     <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.804.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.802.0" />
diff --git a/src/VirtoCommerce.XCart.Data/Extensions/ServiceCollectionExtensions.cs b/src/VirtoCommerce.XCart.Data/Extensions/ServiceCollectionExtensions.cs
index 2a56140..0cd4fc3 100644
--- a/src/VirtoCommerce.XCart.Data/Extensions/ServiceCollectionExtensions.cs
+++ b/src/VirtoCommerce.XCart.Data/Extensions/ServiceCollectionExtensions.cs
@@ -1,10 +1,12 @@
 using System;
-using GraphQL.DI;
+using GraphQL.Server;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using VirtoCommerce.MarketingModule.Core.Model.Promotions;
 using VirtoCommerce.PricingModule.Core.Model;
 using VirtoCommerce.TaxModule.Core.Model;
+using VirtoCommerce.Xapi.Core.Extensions;
+using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.Xapi.Core.Pipelines;
 using VirtoCommerce.XCart.Core;
 using VirtoCommerce.XCart.Core.Models;
@@ -21,8 +23,9 @@ public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddXCart(this IServiceCollection services, IGraphQLBuilder graphQLBuilder)
         {
-            //graphQLBuilder.AddSchema(typeof(CoreAssemblyMarker), typeof(DataAssemblyMarker));
-            //services.AddSingleton<ScopedSchemaFactory<DataAssemblyMarker>>();
+            graphQLBuilder.AddSchema(typeof(CoreAssemblyMarker), typeof(DataAssemblyMarker));
+
+            services.AddSingleton<ScopedSchemaFactory<DataAssemblyMarker>>();
 
             services.AddSingleton<IAuthorizationHandler, CanAccessCartAuthorizationHandler>();
             services.AddTransient<ICartAggregateRepository, CartAggregateRepository>();
diff --git a/src/VirtoCommerce.XCart.Data/Schemas/PurchaseSchema.cs b/src/VirtoCommerce.XCart.Data/Schemas/PurchaseSchema.cs
index 85eee11..e8d4449 100644
--- a/src/VirtoCommerce.XCart.Data/Schemas/PurchaseSchema.cs
+++ b/src/VirtoCommerce.XCart.Data/Schemas/PurchaseSchema.cs
@@ -799,7 +799,7 @@ public void Build(ISchema schema)
                     new QueryArgument<StringGraphType> { Name = "cartType", Description = "Cart type" },
                     new QueryArgument<NonNullGraphType<StringGraphType>> { Name = "coupon", Description = "Cart promo coupon code" }),
                 Type = typeof(BooleanGraphType),
-                Resolver = new FuncFieldResolver<object>(async context =>
+                Resolver = new AsyncFieldResolver<object>(async context =>
                 {
                     var query = context.GetCartQuery<ValidateCouponQuery>();
                     query.CartId = context.GetArgumentOrValue<string>("cartId");
@@ -1272,7 +1272,7 @@ public void Build(ISchema schema)
                         new QueryArgument<NonNullGraphType<StringGraphType>> { Name = "listId", Description = "List Id" },
                         new QueryArgument<StringGraphType> { Name = "cultureName", Description = "Culture name (\"en-Us\")" }),
                 Type = GraphTypeExtenstionHelper.GetActualType<WishlistType>(),
-                Resolver = new FuncFieldResolver<object>(async context =>
+                Resolver = new AsyncFieldResolver<object>(async context =>
                 {
                     var getListQuery = AbstractTypeFactory<GetWishlistQuery>.TryCreateInstance();
                     getListQuery.ListId = context.GetArgument<string>("listId");
diff --git a/src/VirtoCommerce.XCart.Web/Module.cs b/src/VirtoCommerce.XCart.Web/Module.cs
index 32137d3..334d71a 100644
--- a/src/VirtoCommerce.XCart.Web/Module.cs
+++ b/src/VirtoCommerce.XCart.Web/Module.cs
@@ -1,10 +1,9 @@
-using GraphQL.MicrosoftDI;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using VirtoCommerce.Platform.Core.Modularity;
 using VirtoCommerce.Xapi.Core.Extensions;
-using VirtoCommerce.XCart.Core;
+using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.XCart.Data;
 using VirtoCommerce.XCart.Data.Extensions;
 
@@ -17,11 +16,7 @@ public class Module : IModule, IHasConfiguration
 
     public void Initialize(IServiceCollection serviceCollection)
     {
-        var graphQlBuilder = new GraphQLBuilder(serviceCollection, builder =>
-        {
-            builder.AddSchema(serviceCollection, typeof(CoreAssemblyMarker), typeof(DataAssemblyMarker));
-        });
-
+        var graphQlBuilder = new CustomGraphQLBuilder(serviceCollection);
         serviceCollection.AddXCart(graphQlBuilder);
     }
 
diff --git a/src/VirtoCommerce.XCart.Web/module.manifest b/src/VirtoCommerce.XCart.Web/module.manifest
index 429eefd..6bb594a 100644
--- a/src/VirtoCommerce.XCart.Web/module.manifest
+++ b/src/VirtoCommerce.XCart.Web/module.manifest
@@ -12,8 +12,8 @@
     <dependency id="VirtoCommerce.Payment" version="3.804.0" />
     <dependency id="VirtoCommerce.Pricing" version="3.809.0" />
     <dependency id="VirtoCommerce.Shipping" version="3.802.0" />
-    <dependency id="VirtoCommerce.Xapi" version="3.816.0" />
-    <dependency id="VirtoCommerce.XCatalog" version="3.820.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.815.0" />
+    <dependency id="VirtoCommerce.XCatalog" version="3.818.0" />
   </dependencies>
 
   <title>Cart Experience API</title>