diff --git a/daemon/table/cs.cpp b/daemon/table/cs.cpp
index d437dbd..10f465e 100644
--- a/daemon/table/cs.cpp
+++ b/daemon/table/cs.cpp
@@ -19,15 +19,15 @@
 }
 
 bool
-Cs::insert(shared_ptr<Data> data)
+Cs::insert(const Data &data)
 {
   return false;
 }
   
-shared_ptr<Data>
+const Data*
 Cs::find(const Interest& interest)
 {
-  return shared_ptr<Data>();
+  return 0;
 }
 
 
diff --git a/daemon/table/cs.hpp b/daemon/table/cs.hpp
index c1c3e37..c13e72c 100644
--- a/daemon/table/cs.hpp
+++ b/daemon/table/cs.hpp
@@ -30,12 +30,12 @@
    *  \return{ whether the Data is added }
    */
   bool
-  insert(shared_ptr<Data> data);
+  insert(const Data &data);
   
   /** \brief finds the best match Data for an Interest
-   *  \return{ the best match, if any; otherwise null }
+   *  \return{ the best match, if any; otherwise 0 }
    */
-  shared_ptr<Data>
+  const Data*
   find(const Interest& interest);
 };
 
diff --git a/tests/table/cs.cpp b/tests/table/cs.cpp
index 3cb9993..3462476 100644
--- a/tests/table/cs.cpp
+++ b/tests/table/cs.cpp
@@ -16,7 +16,7 @@
 {
   Cs cs;
   
-  shared_ptr<Data> data = make_shared<Data>();
+  Data data;
   BOOST_CHECK_EQUAL(cs.insert(data), false);
   
   Interest interest;