diff --git a/Toolkit.Foundation/ComponentFactory.cs b/Toolkit.Foundation/ComponentFactory.cs
index 2019c77..9402fb2 100644
--- a/Toolkit.Foundation/ComponentFactory.cs
+++ b/Toolkit.Foundation/ComponentFactory.cs
@@ -20,6 +20,12 @@ public class ComponentFactory(IServiceProvider provider,
 
             builder.AddServices(services =>
             {
+                services.AddTransient(_ => 
+                    provider.GetRequiredService<IProxyServiceCollection<IComponentBuilder>>());
+
+                services.AddTransient(_ =>
+                    provider.GetRequiredService<IComponentFactory>());
+
                 services.AddTransient(_ =>
                     provider.GetRequiredService<IProxyService<IPublisher>>());
 
@@ -31,7 +37,7 @@ public class ComponentFactory(IServiceProvider provider,
 
                 services.AddScoped(_ =>
                     provider.GetRequiredService<INavigationRegionProvider>());
-
+              
                 services.AddScoped(_ =>
                     provider.GetRequiredService<IComponentScopeCollection>());
 
diff --git a/Toolkit.Foundation/DefaultHostBuilder.cs b/Toolkit.Foundation/DefaultHostBuilder.cs
index b5e30d5..4cc1518 100644
--- a/Toolkit.Foundation/DefaultHostBuilder.cs
+++ b/Toolkit.Foundation/DefaultHostBuilder.cs
@@ -53,10 +53,10 @@ public class DefaultHostBuilder :
                 services.AddScoped<INavigation, Navigation>();
 
                 services.AddSingleton(new NamedComponent("Root"));
-                services.AddScoped<IComponentScopeCollection, ComponentScopeCollection>(provider => new ComponentScopeCollection
-                {
+                services.AddScoped<IComponentScopeCollection, ComponentScopeCollection>(provider =>
+                [
                     new ComponentScopeDescriptor("Root", provider.GetRequiredService<IServiceProvider>())
-                });
+                ]);
 
                 services.AddTransient<IComponentFactory, ComponentFactory>();
                 services.AddTransient<IComponentScopeProvider, ComponentScopeProvider>();