diff --git a/Library/OSRM.h b/Library/OSRM.h
index 17e27a1c8..5e37f2c6d 100644
--- a/Library/OSRM.h
+++ b/Library/OSRM.h
@@ -29,6 +29,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../Plugins/NearestPlugin.h"
 #include "../Plugins/TimestampPlugin.h"
 #include "../Plugins/ViaRoutePlugin.h"
+#include "../Server/DataStructures/BaseDataFacade.h"
 #include "../Server/DataStructures/RouteParameters.h"
 #include "../Util/IniFile.h"
 #include "../Util/InputFileUtil.h"
@@ -44,8 +45,11 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <vector>
 
 class OSRM : boost::noncopyable {
+private:
     typedef boost::unordered_map<std::string, BasePlugin *> PluginMap;
     QueryObjectsStorage * objects;
+    BaseDataFacade<QueryEdge::EdgeData> * query_data_facade;
+
 public:
     OSRM(const char * server_ini_path, const bool use_shared_memory = false);
     ~OSRM();
diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
index 1c3c3c660..2316d27f3 100644
--- a/Server/DataStructures/BaseDataFacade.h
+++ b/Server/DataStructures/BaseDataFacade.h
@@ -31,10 +31,10 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <string>
 
 template<class EdgeDataT>
-class QueryDataFacade {
+class BaseDataFacade {
 public:
-    QueryDataFacade() { }
-    virtual ~QueryDataFacade() { }
+    BaseDataFacade() { }
+    virtual ~BaseDataFacade() { }
 
     //search graph access
     virtual unsigned GetNumberOfNodes() const = 0;
@@ -67,7 +67,6 @@ public:
         bool & result
     ) const = 0;
 
-
     //node and edge information access
     virtual FixedPointCoordinate GetCoordinateOfNode(
         const unsigned id
@@ -96,7 +95,6 @@ public:
         const unsigned name_id,
         std::string & result
     ) const = 0;
-
 };