diff --git a/src/Moryx.AbstractionLayer/Drivers/Axis/IAxesController.cs b/src/Moryx.AbstractionLayer/Drivers/Axis/IAxesController.cs
index 1454f7f9d..847ee0882 100644
--- a/src/Moryx.AbstractionLayer/Drivers/Axis/IAxesController.cs
+++ b/src/Moryx.AbstractionLayer/Drivers/Axis/IAxesController.cs
@@ -15,15 +15,13 @@ public interface IAxesController : IDriver
         /// </summary>
         /// <param name="axis">The axis which should be moved</param>
         /// <param name="targetPosition">The target position of the axis</param>
-        /// <param name="callback">The callback which will be executed after the axis movement</param>
-        void MoveAxis(Axes axis, double targetPosition, DriverResponse<AxisMovementResponse> callback);
+        Task<AxisMovementResponse> MoveAxis(Axes axis, double targetPosition);
 
         /// <summary>
         /// Will move the axis of the laser to the given position
         /// </summary>
         /// <param name="axis">The axis which should be moved</param>
         /// <param name="targetPosition">The target position of the axis</param>
-        /// <param name="callback">The callback which will be executed after the axis movement</param>
-        void MoveAxis(Axes axis, AxisPosition targetPosition, DriverResponse<AxisMovementResponse> callback);
+        Task<AxisMovementResponse> MoveAxis(Axes axis, AxisPosition targetPosition);
     }
 }
diff --git a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs b/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
index 3d275bdd7..12efd1da8 100644
--- a/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
+++ b/src/Moryx.AbstractionLayer/Drivers/Camera/ICameraDriver.cs
@@ -19,10 +19,10 @@ public interface ICameraDriver<TImage> : IDriver where TImage : class
         /// Capture a single image from the camera
         /// </summary>
         /// <returns>
-        ///     The image that was captured or null in case no image 
+        ///     The image that was captured or null in case no image
         ///     could be retrieved
         /// </returns>
-        Task<TImage?> CaptureImage();
+        Task<TImage> CaptureImage();
     }
 }
 
diff --git a/src/Moryx.AbstractionLayer/Drivers/Marking/IMarkingLaserDriver.cs b/src/Moryx.AbstractionLayer/Drivers/Marking/IMarkingLaserDriver.cs
index cdd742add..eda78684f 100644
--- a/src/Moryx.AbstractionLayer/Drivers/Marking/IMarkingLaserDriver.cs
+++ b/src/Moryx.AbstractionLayer/Drivers/Marking/IMarkingLaserDriver.cs
@@ -9,26 +9,15 @@ namespace Moryx.AbstractionLayer.Drivers.Marking
     public interface IMarkingLaserDriver : IDriver
     {
         /// <summary>
-        /// Set up marking file as a preperation for the marking process
+        /// Set up marking file as a preparation for the marking process
         /// </summary>
-        void SetMarkingFile(MarkingFile file, DriverResponse<MarkingFileResponse> callback);
+        Task<MarkingFileResponse> SetMarkingFileAsync(MarkingFile file);
 
         /// <summary>
         /// Will start the marking process and executes the given callback after finish
         /// </summary>
         /// <param name="config">The configuration for the marking process.</param>
-        /// <param name="callback">The callback which will be executed after the marking process</param>
-        void Mark(MarkingConfiguration config, DriverResponse<MarkingResponse> callback);
-
-        /// <summary>
-        /// Triggers a message to get the last error
-        /// </summary>
-        void RequestLastError();
-
-        /// <summary>
-        /// Triggers a message to get the last warning
-        /// </summary>
-        void RequestLastWarning();
+        Task<MarkingResponse> MarkAsync(MarkingConfiguration config);
 
         /// <summary>
         /// Will be fired if an error occured
diff --git a/src/Moryx.AbstractionLayer/Drivers/PickByLight/IPickByLightDriver.cs b/src/Moryx.AbstractionLayer/Drivers/PickByLight/IPickByLightDriver.cs
index e6739fb9e..0eda99a28 100644
--- a/src/Moryx.AbstractionLayer/Drivers/PickByLight/IPickByLightDriver.cs
+++ b/src/Moryx.AbstractionLayer/Drivers/PickByLight/IPickByLightDriver.cs
@@ -11,12 +11,12 @@ public interface IPickByLightDriver : IDriver
         /// <summary>
         /// Activate instruction for this address
         /// </summary>
-        void ActivateInstruction(string address, LightInstructions instruction);
+        Task ActivateInstruction(string address, LightInstructions instruction);
 
         /// <summary>
         /// Deactivate an instruction
         /// </summary>
-        void DeactivateInstruction(string address);
+        Task DeactivateInstruction(string address);
 
         /// <summary>
         /// Instruction was confirmed
diff --git a/src/Moryx.AbstractionLayer/Drivers/Scales/IWeightScaleDriver.cs b/src/Moryx.AbstractionLayer/Drivers/Scales/IWeightScaleDriver.cs
index a6edbc2db..fc4895b82 100644
--- a/src/Moryx.AbstractionLayer/Drivers/Scales/IWeightScaleDriver.cs
+++ b/src/Moryx.AbstractionLayer/Drivers/Scales/IWeightScaleDriver.cs
@@ -11,7 +11,7 @@ public interface IWeightScaleDriver : IDriver
         /// <summary>
         /// Requests the weight from the scale.
         /// </summary>
-        void GetCurrentWeight(DriverResponse<WeightResult> callback);
+        Task<WeightResult> GetCurrentWeight();
 
         /// <summary>
         /// Occurs when the weight scale weight was read.
diff --git a/src/Moryx.AbstractionLayer/Drivers/TransmissionResult.cs b/src/Moryx.AbstractionLayer/Drivers/TransmissionResult.cs
index d9b5500a3..64bddf263 100644
--- a/src/Moryx.AbstractionLayer/Drivers/TransmissionResult.cs
+++ b/src/Moryx.AbstractionLayer/Drivers/TransmissionResult.cs
@@ -4,12 +4,7 @@
 namespace Moryx.AbstractionLayer.Drivers
 {
     /// <summary>
-    /// Generic base delegate for driver APIs with callback
-    /// </summary>
-    public delegate void DriverResponse<in TResult>(IDriver sender, TResult result) where TResult : TransmissionResult;
-
-    /// <summary>
-    /// Base result object for transissions
+    /// Base result object for transmissions
     /// </summary>
     public abstract class TransmissionResult
     {