diff --git a/Pilz.Plugins.Advanced/Exceptions/PluginFeatureExceptions.cs b/Pilz.Plugins.Advanced/Exceptions/PluginFeatureExceptions.cs
new file mode 100644
index 0000000..df882a1
--- /dev/null
+++ b/Pilz.Plugins.Advanced/Exceptions/PluginFeatureExceptions.cs
@@ -0,0 +1,5 @@
+namespace Pilz.Plugins.Advanced.Exceptions;
+
+public class PluginFeatureException : Exception;
+
+public class PluginFeatureNotFoundException : PluginFeatureException;
diff --git a/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj b/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
index d407958..f8f6737 100644
--- a/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
+++ b/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <Version>2.10.6</Version>
+    <Version>2.10.7</Version>
   </PropertyGroup>
   
 </Project>
\ No newline at end of file
diff --git a/Pilz.Plugins.Advanced/PluginFeatureController.cs b/Pilz.Plugins.Advanced/PluginFeatureController.cs
index 024cd56..18f5ffb 100644
--- a/Pilz.Plugins.Advanced/PluginFeatureController.cs
+++ b/Pilz.Plugins.Advanced/PluginFeatureController.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using Pilz.Plugins.Advanced.Exceptions;
+using System.Reflection;
 
 namespace Pilz.Plugins.Advanced;
 
@@ -193,7 +194,24 @@ public class PluginFeatureController
 
         public virtual IEnumerable<PluginFeature> GetAll()
         {
-            return controller.features.ToArray();
+            return [.. controller.features];
+        }
+
+        public virtual IEnumerable<T> GetAll<T>() where T : PluginFeature
+        {
+            return controller.features.OfType<T>();
+        }
+
+        public virtual T? Get<T>() where T : PluginFeature
+        {
+            return GetAll<T>().FirstOrDefault();
+        }
+
+        public virtual T? Get<T>(bool throwIfNull) where T : PluginFeature
+        {
+            if (Get<T>() is T feature)
+                return feature;
+            throw new PluginFeatureNotFoundException();
         }
 
         public virtual IEnumerable<PluginFeature> Get(string featureType)
@@ -221,7 +239,7 @@ public class PluginFeatureController
     {
         public override IEnumerable<T> GetAll()
         {
-            return controller.features.OfType<T>();
+            return GetAll<T>();
         }
 
         public override IEnumerable<T> Get(string moduleType)