diff --git a/Source/Csla.Shared/Configuration/ConfigurationExtensions.cs b/Source/Csla.Shared/Configuration/ConfigurationExtensions.cs
index a8ce6fc349..de6adaad20 100644
--- a/Source/Csla.Shared/Configuration/ConfigurationExtensions.cs
+++ b/Source/Csla.Shared/Configuration/ConfigurationExtensions.cs
@@ -24,7 +24,7 @@ public static class ConfigurationExtensions
     public static ICslaBuilder AddCsla(this IServiceCollection services)
     {
       services.AddSingleton<IDataPortalFactory, DataPortalFactory>();
-      return null;
+      return new CslaBuilder();
     }
 
     /// <summary>
diff --git a/Source/Csla.Shared/Configuration/CslaBuilder.cs b/Source/Csla.Shared/Configuration/CslaBuilder.cs
new file mode 100644
index 0000000000..dfff1fcbe0
--- /dev/null
+++ b/Source/Csla.Shared/Configuration/CslaBuilder.cs
@@ -0,0 +1,20 @@
+//-----------------------------------------------------------------------
+// <copyright file="ICslaBuilder.cs" company="Marimer LLC">
+//     Copyright (c) Marimer LLC. All rights reserved.
+//     Website: http://www.lhotka.net/cslanet/
+// </copyright>
+// <summary>Default CSLA .NET service builder</summary>
+//-----------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Csla.Configuration
+{
+  /// <summary>
+  /// Default CSLA .NET service builder
+  /// </summary>
+  public class CslaBuilder : ICslaBuilder
+  {
+  }
+}
diff --git a/Source/Csla.Shared/Csla.Shared.projitems b/Source/Csla.Shared/Csla.Shared.projitems
index 7c508a4700..2f0a68c6ba 100644
--- a/Source/Csla.Shared/Csla.Shared.projitems
+++ b/Source/Csla.Shared/Csla.Shared.projitems
@@ -23,6 +23,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Configuration\ConnectionStringSettingsCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Configuration\ConfigurationManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Configuration\ConnectionStringSettings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Configuration\CslaBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Configuration\CslaConfiguration.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Configuration\CslaConfigurationOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Configuration\CslaDataConfiguration.cs" />