diff --git a/FlippR-Driver/networking/input/InputSocketHandler.cpp b/FlippR-Driver/networking/input/InputSocketHandler.cpp
index 1ac98f7..64915fb 100644
--- a/FlippR-Driver/networking/input/InputSocketHandler.cpp
+++ b/FlippR-Driver/networking/input/InputSocketHandler.cpp
@@ -31,7 +31,7 @@ void InputSocketHandler::run()
 {
   while(true)
   {
-    Event event = this->queue->pop();
+    Event event = this->queue.pop();
 
     if(event.name == "END")
     {
@@ -49,7 +49,7 @@ void InputSocketHandler::run()
 
 void InputSocketHandler::handle(Event &event)
 {
-  this->queue->push(event);
+  this->queue.push(event);
 }
 
 
diff --git a/FlippR-Driver/networking/input/InputSocketHandler.h b/FlippR-Driver/networking/input/InputSocketHandler.h
index 4b24ff4..3dcbe42 100644
--- a/FlippR-Driver/networking/input/InputSocketHandler.h
+++ b/FlippR-Driver/networking/input/InputSocketHandler.h
@@ -14,7 +14,7 @@
 #include "input/InputDriver.h"
 #include "input/EventHandler.h"
 #include "input/Event.h"
-#include "utility/IBlockingQueue.h"
+#include "utility/BlockingQueue.hpp"
 
 namespace flippR_driver
 {
@@ -32,7 +32,7 @@ public:
   void handle(flippR_driver::input::Event &event) override;
 
 private:
-  utility::IBlockingQueue<flippR_driver::input::Event>* queue;
+  utility::BlockingQueue<flippR_driver::input::Event> queue;
 };
 
 }