diff --git a/src/Snowberry.DependencyInjection/Implementation/ServiceDescriptor.cs b/src/Snowberry.DependencyInjection/Implementation/ServiceDescriptor.cs
index d867763..7aa1c74 100644
--- a/src/Snowberry.DependencyInjection/Implementation/ServiceDescriptor.cs
+++ b/src/Snowberry.DependencyInjection/Implementation/ServiceDescriptor.cs
@@ -46,11 +46,6 @@ public static ServiceDescriptor Scoped(Type serviceType, Type implementationType
     /// <inheritdoc/>
     public Type ImplementationType { get; }
 
-    /// <summary>
-    /// The optional service key.
-    /// </summary>
-    public object? ServiceKey { get; }
-
     /// <inheritdoc/>
     public ServiceLifetime Lifetime { get; }
 }
diff --git a/src/Snowberry.DependencyInjection/Interfaces/IServiceDescriptorCollection.cs b/src/Snowberry.DependencyInjection/Interfaces/IServiceDescriptorCollection.cs
index 1defeef..2d07376 100644
--- a/src/Snowberry.DependencyInjection/Interfaces/IServiceDescriptorCollection.cs
+++ b/src/Snowberry.DependencyInjection/Interfaces/IServiceDescriptorCollection.cs
@@ -35,5 +35,16 @@ public interface IServiceDescriptorReceiver : IDisposableContainer
     /// <typeparam name="T">The type of the service.</typeparam>
     /// <param name="serviceKey">The optional service key.</param>
     /// <returns>The optional service descriptor for the specified type.</returns>
-    IServiceDescriptor? GetOptionalServiceDescriptor<T>(object? serviceKey);
+    IServiceDescriptor? GetOptionalServiceDescriptor<T>(object? serviceKey);
+
+    /// <summary>
+    /// Returns the collection of registered service descriptors.
+    /// </summary>
+    /// <returns>The collection.</returns>
+    IServiceDescriptor[] GetServiceDescriptors();
+
+    /// <summary>
+    /// Gets the amount of registered service descriptor.
+    /// </summary>
+    int Count { get; }
 }
diff --git a/src/Snowberry.DependencyInjection/Interfaces/IServiceRegistry.cs b/src/Snowberry.DependencyInjection/Interfaces/IServiceRegistry.cs
index a7145a6..a19c79c 100644
--- a/src/Snowberry.DependencyInjection/Interfaces/IServiceRegistry.cs
+++ b/src/Snowberry.DependencyInjection/Interfaces/IServiceRegistry.cs
@@ -134,9 +134,4 @@ public interface IServiceRegistry
     /// <typeparam name="T">The type of the service.</param>
     /// <returns>Whether the given <typeparamref name="T"/> is registered or not.</returns>
     bool IsServiceRegistered<T>(object? serviceKey);
-
-    /// <summary>
-    /// Gets the amount of registered services.
-    /// </summary>
-    int Count { get; }
 }
diff --git a/src/Snowberry.DependencyInjection/Lookup/DefaultServiceFactory.cs b/src/Snowberry.DependencyInjection/Lookup/DefaultServiceFactory.cs
index 3c23d06..859044a 100644
--- a/src/Snowberry.DependencyInjection/Lookup/DefaultServiceFactory.cs
+++ b/src/Snowberry.DependencyInjection/Lookup/DefaultServiceFactory.cs
@@ -115,7 +115,7 @@ protected object CreateBuiltInType(Type type)
         return typeCode switch
         {
             TypeCode.Empty => throw new NotImplementedException(),
-            TypeCode.Object => throw new NotImplementedException(),
+            TypeCode.Object => new object(),
             TypeCode.Boolean => false,
             TypeCode.Byte => (byte)0,
             TypeCode.Char => (char)0,
diff --git a/src/Snowberry.DependencyInjection/ServiceContainer.cs b/src/Snowberry.DependencyInjection/ServiceContainer.cs
index b68c62d..cbf63e4 100644
--- a/src/Snowberry.DependencyInjection/ServiceContainer.cs
+++ b/src/Snowberry.DependencyInjection/ServiceContainer.cs
@@ -273,7 +273,16 @@ public T GetKeyedService<T>(object? serviceKey)
     /// The service factory that will be used.
     /// </summary>
     public IScopedServiceFactory ServiceFactory { get; }
-
+
+    /// <inheritdoc/>
+    public IServiceDescriptor[] GetServiceDescriptors()
+    {
+        lock (_lock)
+        {
+            return [.. _serviceDescriptorMapping.Values];
+        }
+    }
+
     /// <inheritdoc/>
     public int Count
     {
diff --git a/src/Snowberry.DependencyInjection/Snowberry.DependencyInjection.csproj b/src/Snowberry.DependencyInjection/Snowberry.DependencyInjection.csproj
index 7449a20..f9306d0 100644
--- a/src/Snowberry.DependencyInjection/Snowberry.DependencyInjection.csproj
+++ b/src/Snowberry.DependencyInjection/Snowberry.DependencyInjection.csproj
@@ -10,7 +10,7 @@
         <Authors>Snowberry Software</Authors>
         <Description>A lightweight easy to use IoC container for .NET.</Description>
 
-        <AssemblyVersion>3.2.0.0</AssemblyVersion>
+        <AssemblyVersion>3.3.0.0</AssemblyVersion>
         <VersionPrefix>$(AssemblyVersion)</VersionPrefix>
 
         <IsPackable>true</IsPackable>
diff --git a/src/Tests/Snowberry.DependencyInjection.Tests/KeyedTests.cs b/src/Tests/Snowberry.DependencyInjection.Tests/KeyedTests.cs
index 1c960a1..9e9a656 100644
--- a/src/Tests/Snowberry.DependencyInjection.Tests/KeyedTests.cs
+++ b/src/Tests/Snowberry.DependencyInjection.Tests/KeyedTests.cs
@@ -20,6 +20,8 @@ public void Keyed_Simple_Singleton()
         }, "_KEY_");
 
         Assert.Equal("2", serviceContainer.GetKeyedService<ITestService>("_KEY_").Name);
+        Assert.Equal(2, serviceContainer.Count);
+        Assert.Equal(2, serviceContainer.GetServiceDescriptors().Length);
     }
 
     [Fact]