diff --git a/cmake/Pistache.cmake b/cmake/Pistache.cmake
index 87630ef..f5807f1 100644
--- a/cmake/Pistache.cmake
+++ b/cmake/Pistache.cmake
@@ -1,19 +1,23 @@
 project(pistache)
 include(ExternalProject)
 
-set(PISTACHE_BINARY_DIR ${THIRD_PARTY_DIR}/pistache)
-
-ExternalProject_Add(${PROJECT_NAME}_extern
+ExternalProject_Add(PistacheDownload
+  PREFIX          third_party
   GIT_REPOSITORY  https://github.com/pistacheio/pistache.git
   GIT_TAG         master
-  BINARY_DIR      ${PISTACHE_BINARY_DIR}
   INSTALL_COMMAND ""
 )
 
-add_library(${PROJECT_NAME} STATIC IMPORTED)
-add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_extern)
+set(PISTACHE_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/third_party/src/PistacheDownload/include)
+set(PISTACHE_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/third_party/src/PistacheDownload-build/src)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES IMPORTED_LOCATION "${PISTACHE_BINARY_DIR}/lib/libpistache.a")
+add_library(${PROJECT_NAME} SHARED IMPORTED)
+add_dependencies(${PROJECT_NAME} $PistacheDownload)
+set_target_properties(${PROJECT_NAME} PROPERTIES IMPORTED_LOCATION "${PISTACHE_LIB_DIR}/libpistache.a")
+
+#add_library(${PROJECT_NAME} STATIC IMPORTED)
+
+#set_target_properties(${PROJECT_NAME} PROPERTIES IMPORTED_LOCATION "${PISTACHE_BINARY_DIR}/lib/libpistache.a")
 
 #file(MAKE_DIRECTORY "${PISTACHE_BINARY_DIR}/include")
-target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE "${PISTACHE_BINARY_DIR}/include/")
+#target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE "${PISTACHE_BINARY_DIR}/include/")
diff --git a/daggy/CMakeLists.txt b/daggy/CMakeLists.txt
index e2ef676..d37eadc 100644
--- a/daggy/CMakeLists.txt
+++ b/daggy/CMakeLists.txt
@@ -4,6 +4,7 @@ project(daggy)
 
 file(GLOB SOURCES src/*.cpp)
 add_library(${PROJECT_NAME} STATIC ${SOURCES})
+include_directories(${PISTACHE_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PUBLIC include)
-add_dependencies(${PROJECT_NAME} pistache)
 target_link_libraries(${PROJECT_NAME} pistache pthread)
+add_dependencies(${PROJECT_NAME} PistacheDownload)
diff --git a/daggy/include/daggy/Server.hpp b/daggy/include/daggy/Server.hpp
index 90ab7df..ee3f222 100644
--- a/daggy/include/daggy/Server.hpp
+++ b/daggy/include/daggy/Server.hpp
@@ -9,7 +9,7 @@
 namespace daggy {
   class Server {
     public:
-      Server(Address addr)
+      Server(Pistache::Address addr)
         : endpoint_(addr)
           , desc("Daggy API", "0.1")
     {}
@@ -23,7 +23,7 @@ namespace daggy {
 
       Pistache::Http::Endpoint    endpoint_;
       Pistache::Rest::Description desc_;
-      Pistache::Router            router_;
+      Pistache::Http::Router      router_;
 
   };
 }