diff --git a/src/fetcher.h b/src/fetcher.h
index 8cb4664..fba4f29 100644
--- a/src/fetcher.h
+++ b/src/fetcher.h
@@ -22,26 +22,34 @@
 #ifndef FETCHER_H
 #define FETCHER_H
 
-#include <stdint.h>
-#include <sqlite3.h>
-#include <boost/exception/all.hpp>
-#include <string>
-#include <boost/filesystem.hpp>
+#include "ccnx-wrapper.h"
+#include "scheduler.h"
 
-typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info_str; 
-
-class Fetcher
+class Fetcher 
 {
 public:
-  Fetcher (const boost::filesystem::path &path, const std::string &name);
+  Fetcher (Ccnx::CcnxWrapperPtr ccnx, SchedulerPtr scheduler,
+           const Ccnx::Name &name, int32_t minSeqNo, int32_t maxSeqNo,
+           const Ccnx::Name &forwardingHint = Ccnx::Name ());
   virtual ~Fetcher ();
   
 private:
+  Ccnx::CcnxWrapperPtr m_ccnx;
+  SchedulerPtr m_scheduler;
+  
+  Ccnx::Name m_name;
+  Ccnx::Name m_forwardingHint;
+  
+  int32_t m_minSendSeqNo;
+  int32_t m_maxSendSeqNo;
+  int32_t m_minSeqNo;
+  int32_t m_maxSeqNo;
 
-protected:
-  sqlite3 *m_db;
+  uint32_t m_pipeline;
 };
 
+typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info_str; 
+
 namespace Error {
 struct Fetcher : virtual boost::exception, virtual std::exception { };
 }