diff --git a/NotoriousTest.Core/Extensions/OutputConfigurationExtension.cs b/NotoriousTest.Core/Extensions/OutputConfigurationExtension.cs
deleted file mode 100644
index 3bd4b15..0000000
--- a/NotoriousTest.Core/Extensions/OutputConfigurationExtension.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using NotoriousTest.Core.Configuration;
-
-namespace NotoriousTest.Core.Extensions;
-
-// Extension OutputConfiguration
-public class OutputConfigurationExtension<TOutputConfiguration> : IInfrastructureExtension
-{
-    public List<ConfigurationEntry<TOutputConfiguration>> OutputConfiguration { get; } = new();
-
-    public void AddEntry(string key, TOutputConfiguration value)
-        => OutputConfiguration.Add(new ConfigurationEntry<TOutputConfiguration>(value, key));
-
-    public void AddEntry(TOutputConfiguration value)
-        => OutputConfiguration.Add(new ConfigurationEntry<TOutputConfiguration>(value, value!.GetType().Name));
-}
diff --git a/NotoriousTest.Core/Infrastructures/Infrastructure.cs b/NotoriousTest.Core/Infrastructures/Infrastructure.cs
index 0b51038..c620c59 100644
--- a/NotoriousTest.Core/Infrastructures/Infrastructure.cs
+++ b/NotoriousTest.Core/Infrastructures/Infrastructure.cs
@@ -1,5 +1,4 @@
 using NotoriousTest.Core.Configuration;
-using NotoriousTest.Core.Extensions;
 using NotoriousTest.Core.Logger;
 using NotoriousTest.Core.Registry;
 
@@ -11,15 +10,17 @@ namespace NotoriousTest.Core.Infrastructures;
 public abstract class Infrastructure<TOutputConfiguration, TMetadata> : Infrastructure<TMetadata>, IConfigurationProducer<TOutputConfiguration>
     where TMetadata : class
 {
-    public List<ConfigurationEntry<TOutputConfiguration>> OutputConfiguration => OutputConfigurationExtension.OutputConfiguration;
+    public List<ConfigurationEntry<TOutputConfiguration>> OutputConfiguration { get; } = new();
 
-    protected OutputConfigurationExtension<TOutputConfiguration> OutputConfigurationExtension { get; private set; }
     protected Infrastructure(EnvironmentId contextId, ITestLogger logger, IRegistry provider) : base(contextId, logger, provider)
     {
-        OutputConfigurationExtension = EnsureExtension(new OutputConfigurationExtension<TOutputConfiguration>());
     }
 
-    public void AddEntry(string key, TOutputConfiguration value) => OutputConfigurationExtension.AddEntry(key, value);
+    public void AddEntry(string key, TOutputConfiguration value)
+        => OutputConfiguration.Add(new ConfigurationEntry<TOutputConfiguration>(value, key));
+
+    public void AddEntry(TOutputConfiguration value)
+        => OutputConfiguration.Add(new ConfigurationEntry<TOutputConfiguration>(value, value!.GetType().Name));
 }
 
 public abstract class Infrastructure<TMetadata> : Infrastructure where TMetadata : class