diff --git a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs b/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
index 3c4dd565..9d287dc7 100644
--- a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
+++ b/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
@@ -1,4 +1,5 @@
 using Moryx.AbstractionLayer.Drivers;
+using System;
 using System.Threading.Tasks;
 
 namespace Moryx.Drivers.Camera.Interfaces
@@ -9,15 +10,9 @@ namespace Moryx.Drivers.Camera.Interfaces
     public interface ICameraDriver<TImage> : IDriver where TImage : class
     {
         /// <summary>
-        /// Registers an ICameraDriverListener that should be provided
-        /// with images.
+        /// Eventhandler to continously provide images from a camera
         /// </summary>
-        void Register(ICameraDriverListener<TImage> listener);
-
-        /// <summary>
-        /// Unregisters an ICameraDriverListener
-        /// </summary>
-        void Unregister(ICameraDriverListener<TImage> listener);
+        event EventHandler<TImage> CapturedImage;
 
         /// <summary>
         /// Capture a single image from the camera
diff --git a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriverListener.cs b/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriverListener.cs
deleted file mode 100644
index da7a7fe3..00000000
--- a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriverListener.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Moryx.AbstractionLayer.Drivers;
-using System.Threading.Tasks;
-
-namespace Moryx.Drivers.Camera.Interfaces
-{
-    /// <summary>
-    /// Interface for objects that register as listeners to camera drivers
-    /// </summary>
-    public interface ICameraDriverListener<T> where T : class
-    {
-        /// <summary>
-        /// Invoked, when a new image is received by the camera
-        /// </summary>
-        /// <param name="image"></param>
-        /// <returns></returns>
-        Task OnImage(T image);
-    }
-}