diff --git a/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj b/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
index 46d765a..11249c5 100644
--- a/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
+++ b/Pilz.Plugins.Advanced/Pilz.Plugins.Advanced.csproj
@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Pilz.Plugins.Advanced/PluginFeatureController.cs b/Pilz.Plugins.Advanced/PluginFeatureController.cs
index c301a13..2ff7567 100644
--- a/Pilz.Plugins.Advanced/PluginFeatureController.cs
+++ b/Pilz.Plugins.Advanced/PluginFeatureController.cs
@@ -17,14 +17,15 @@ namespace Pilz.Plugins.Advanced
         private readonly List<PluginFeature> features = new();
 
         /// <summary>
-        /// Returns a collection of all registred <see cref="PluginFeature"/> instances.
+        /// A wrapper of all registred <see cref="PluginFeature"/> instances.
         /// </summary>
-        public IReadOnlyList<PluginFeature> Features => features.AsReadOnly();
+        public FeatureController Features { get; init; }
         
         /// <summary>
         /// A wrapper for all registred <see cref="PluginModule"/> instances.
         /// </summary>
         public ModuleController Modules { get; init; }
+
         /// <summary>
         /// A wrapper for all registred <see cref="PluginFunction"/> instances.
         /// </summary>
@@ -32,6 +33,7 @@ namespace Pilz.Plugins.Advanced
 
         public PluginFeatureController()
         {
+            Features = new(this);
             Functions = new(this);
             Modules = new(this);
         }
@@ -47,43 +49,64 @@ namespace Pilz.Plugins.Advanced
             features.Remove(module);
         }
 
-        public class ModuleController
+        public class FeatureController
         {
-            private readonly PluginFeatureController controller;
+            protected readonly PluginFeatureController controller;
 
-            public ModuleController(PluginFeatureController controller)
+            public FeatureController(PluginFeatureController controller)
             {
                 this.controller = controller;
             }
 
-            public IEnumerable<PluginModule> GetAll()
+            public virtual IEnumerable<PluginFeature> GetAll()
             {
-                return controller.features.OfType<PluginModule>();
+                return controller.features.AsReadOnly();
             }
 
-            public IEnumerable<PluginModule> Get(string moduleType)
+            public virtual IEnumerable<PluginFeature> Get(string moduleType)
             {
-                return GetAll().Where(n => n.Type == moduleType);
+                return controller.features.Where(n => n.Type == moduleType);
+            }
+
+            public virtual PluginFeature? GetFirst(string moduleType)
+            {
+                return controller.features.FirstOrDefault(n => n.Type == moduleType);
             }
         }
 
-        public class FunctionController
+        public class FeatureController<T> : FeatureController where T : PluginFeature
         {
-            private readonly PluginFeatureController controller;
-
-            public FunctionController(PluginFeatureController controller)
+            public FeatureController(PluginFeatureController controller) : base(controller)
             {
-                this.controller = controller;
             }
 
-            public IEnumerable<PluginFunction> GetAll()
+            public override IEnumerable<T> GetAll()
             {
-                return controller.features.OfType<PluginFunction>();
+                return controller.features.OfType<T>();
             }
 
-            public IEnumerable<PluginFunction> Get(string functionType)
+            public override IEnumerable<T> Get(string moduleType)
+            {
+                return GetAll().Where(n => n.Type == moduleType);
+            }
+
+            public override T? GetFirst(string moduleType)
+            {
+                return GetAll().FirstOrDefault(n => n.Type == moduleType);
+            }
+        }
+
+        public class ModuleController : FeatureController<PluginModule>
+        {
+            public ModuleController(PluginFeatureController controller) : base(controller)
+            {
+            }
+        }
+
+        public class FunctionController : FeatureController<PluginFunction>
+        {
+            public FunctionController(PluginFeatureController controller) : base(controller)
             {
-                return GetAll().Where(n => n.Type == functionType);
             }
 
             public void ExecuteAll(string functionType)