diff --git a/FlippR-Driver/include/output/items/ILamp.h b/FlippR-Driver/include/output/items/ILamp.h
index 5285815..8481924 100644
--- a/FlippR-Driver/include/output/items/ILamp.h
+++ b/FlippR-Driver/include/output/items/ILamp.h
@@ -21,9 +21,9 @@ public:
   ~ILamp()
   {};
 
-  void activate();
-  void deactivate();
-  bool is_activated();
+  virtual void activate() = 0;
+  virtual void deactivate() = 0;
+  virtual bool is_activated() = 0;
 };
 
 }
diff --git a/FlippR-Driver/include/output/items/ISolenoid.h b/FlippR-Driver/include/output/items/ISolenoid.h
index 2f22767..50ca57d 100644
--- a/FlippR-Driver/include/output/items/ISolenoid.h
+++ b/FlippR-Driver/include/output/items/ISolenoid.h
@@ -20,7 +20,7 @@ class ISolenoid
 public:
   ~ISolenoid()
   {};
-  void trigger();
+  virtual void trigger() = 0;
 };
 
 }
diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp
index f8ce867..c6ce88c 100644
--- a/FlippR-Driver/src/input/Detector.cpp
+++ b/FlippR-Driver/src/input/Detector.cpp
@@ -16,8 +16,8 @@ namespace flippR_driver
 namespace input
 {
 
-Detector::Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>> events) :
-  input_gpio_interface(std::move(input_gpio_interface)), events(events), is_running(true)
+Detector::Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>>& events) :
+  input_gpio_interface(std::move(input_gpio_interface)), events(std::move(events)), is_running(true)
 {
   this->detect_thread = std::thread(&Detector::detect, this);
 
diff --git a/FlippR-Driver/src/input/Detector.h b/FlippR-Driver/src/input/Detector.h
index 7f69985..55ddcf2 100644
--- a/FlippR-Driver/src/input/Detector.h
+++ b/FlippR-Driver/src/input/Detector.h
@@ -34,7 +34,7 @@ class Detector : public IDetector
 {
 
 public:
-  Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>> events);
+  Detector(std::unique_ptr<IInputGPIOInterface> input_gpio_interface, std::vector<std::shared_ptr<DistributingEvent>>& events);
   ~Detector();
 
 private: