diff --git a/Pilz.Plugins/PluginLoadInfo.cs b/Pilz.Plugins/PluginLoadInfo.cs
index 19677a8..5e60e42 100644
--- a/Pilz.Plugins/PluginLoadInfo.cs
+++ b/Pilz.Plugins/PluginLoadInfo.cs
@@ -2,10 +2,10 @@
 
 namespace Pilz.Plugins;
 
-public class PluginLoadInfo<TPluginInterface, TPluginRuntimeInfo> where TPluginInterface : class where TPluginRuntimeInfo : PluginRuntimeInfo<TPluginInterface>
+public class PluginLoadInfo<TPluginInterface, TPluginRuntimeInfo> where TPluginInterface : class where TPluginRuntimeInfo : PluginRuntimeInfo
 {
     internal List<TPluginRuntimeInfo> PluginsInternal { get; } = [];
-    public Assembly Assembly { get; internal set; }
+    public Assembly? Assembly { get; internal set; }
     public PluginLoadStatus Status { get; internal set; }
     public IEnumerable<TPluginRuntimeInfo> Plugins => PluginsInternal.AsReadOnly();
 }
diff --git a/Pilz.Plugins/PluginManager.cs b/Pilz.Plugins/PluginManager.cs
index 30a94f8..19181f9 100644
--- a/Pilz.Plugins/PluginManager.cs
+++ b/Pilz.Plugins/PluginManager.cs
@@ -1,6 +1,6 @@
 namespace Pilz.Plugins;
 
-public class PluginManager : PluginManager<IPlugin, PluginRuntimeInfo>
+public class PluginManager : PluginManager<IPlugin>
 {
     public static PluginManager Instance { get; private set; } = new();
 }
diff --git a/Pilz.Plugins/PluginManagerT.cs b/Pilz.Plugins/PluginManager{T,T}.cs
similarity index 98%
rename from Pilz.Plugins/PluginManagerT.cs
rename to Pilz.Plugins/PluginManager{T,T}.cs
index f9cc638..e74b139 100644
--- a/Pilz.Plugins/PluginManagerT.cs
+++ b/Pilz.Plugins/PluginManager{T,T}.cs
@@ -2,7 +2,7 @@
 
 namespace Pilz.Plugins;
 
-public class PluginManager<TPluginInterface, TPluginRuntimeInfo> where TPluginInterface : class where TPluginRuntimeInfo : PluginRuntimeInfo<TPluginInterface>
+public class PluginManager<TPluginInterface, TPluginRuntimeInfo> where TPluginInterface : class where TPluginRuntimeInfo : PluginRuntimeInfo
 {
     protected readonly List<TPluginRuntimeInfo> loadedPlugins = [];
 
@@ -40,7 +40,7 @@ public class PluginManager<TPluginInterface, TPluginRuntimeInfo> where TPluginIn
     /// <summary>
     /// Loads plugins from the given assemblies.
     /// </summary>
-    /// <param name="paths"></param>
+    /// <param name="assemblies"></param>
     /// <param name="parameters"></param>
     /// <returns></returns>
     public virtual IEnumerable<PluginLoadInfo<TPluginInterface, TPluginRuntimeInfo>> LoadPlugins(Assembly[] assemblies, params object?[]? parameters)
@@ -65,7 +65,8 @@ public class PluginManager<TPluginInterface, TPluginRuntimeInfo> where TPluginIn
     /// <summary>
     /// Loads plugins from already loaded assemblies for the current <see cref="AppDomain.CurrentDomain"/>.
     /// </summary>
-    /// <param name="listenAssemblyLoadContext">Do also load plugins from all yet not loaded assemblies by listening the event <see cref="AppDomain.AssemblyLoad"/>.
+    /// <param name="listenAssemblyLoadContext">Do also load plugins from all yet not loaded assemblies by listening the event <see cref="AppDomain.AssemblyLoad"/></param>
+    /// <param name="parameters"></param>>.
     /// <returns></returns>
     public virtual IEnumerable<PluginLoadInfo<TPluginInterface, TPluginRuntimeInfo>> LoadOwnPlugins(bool listenAssemblyLoadContext, params object?[]? parameters)
     {
diff --git a/Pilz.Plugins/PluginManager{T}.cs b/Pilz.Plugins/PluginManager{T}.cs
new file mode 100644
index 0000000..2c8100c
--- /dev/null
+++ b/Pilz.Plugins/PluginManager{T}.cs
@@ -0,0 +1,3 @@
+namespace Pilz.Plugins;
+
+public class PluginManager<TPluginInterface> : PluginManager<TPluginInterface, PluginRuntimeInfo> where TPluginInterface : class;
\ No newline at end of file
diff --git a/Pilz.Plugins/PluginRuntimeInfo.cs b/Pilz.Plugins/PluginRuntimeInfo.cs
index 7b57581..622fcb3 100644
--- a/Pilz.Plugins/PluginRuntimeInfo.cs
+++ b/Pilz.Plugins/PluginRuntimeInfo.cs
@@ -1,5 +1,11 @@
-namespace Pilz.Plugins;
+using System.Reflection;
 
-public class PluginRuntimeInfo : PluginRuntimeInfo<IPlugin>
+namespace Pilz.Plugins;
+
+public class PluginRuntimeInfo
 {
+    public object? Plugin { get; internal set; }
+    public PluginStatus Status { get; internal set; }
+    public Assembly? Assembly { get; internal set; }
+    public Exception? Exception { get; internal set; }
 }
diff --git a/Pilz.Plugins/PluginRuntimeInfoT.cs b/Pilz.Plugins/PluginRuntimeInfoT.cs
deleted file mode 100644
index bf89e49..0000000
--- a/Pilz.Plugins/PluginRuntimeInfoT.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Reflection;
-
-namespace Pilz.Plugins;
-
-public class PluginRuntimeInfo<T> where T : class
-{
-    public T? Plugin { get; internal set; }
-    public PluginStatus Status { get; internal set; }
-    public Assembly? Assembly { get; internal set; }
-    public Exception? Exception { get; internal set; }
-}
diff --git a/Pilz.Plugins/PluginRuntimeInfo{T}.cs b/Pilz.Plugins/PluginRuntimeInfo{T}.cs
new file mode 100644
index 0000000..66a76fb
--- /dev/null
+++ b/Pilz.Plugins/PluginRuntimeInfo{T}.cs
@@ -0,0 +1,10 @@
+namespace Pilz.Plugins;
+
+public class PluginRuntimeInfo<T> : PluginRuntimeInfo where T : class
+{
+    public new T? Plugin
+    {
+        get => base.Plugin as T;
+        set => base.Plugin = value;
+    }
+}