diff --git a/model/sync-app-data-publish.cc b/model/sync-app-data-publish.cc
index 77b9160..66ca1ae 100644
--- a/model/sync-app-data-publish.cc
+++ b/model/sync-app-data-publish.cc
@@ -31,7 +31,10 @@
 string
 AppDataPublish::getRecentData (const string &prefix, uint32_t session)
 {
-  return "";
+	if (m_recentData.find(make_pair(prefix, session)) != m_recentData.end())
+		return m_recentData[make_pair(prefix, session)];
+	else
+		return "";
 }
 
 uint32_t
@@ -69,6 +72,11 @@
 
   m_ccnxHandle->publishData (contentNameWithSeqno.str (), dataBuffer, freshness);
 
+  unordered_map<pair<string, uint32_t>, string>::iterator it = m_recentData.find(make_pair(name, session));
+	if (it != m_recentData.end()) 
+		m_recentData.erase(it);
+	m_recentData.insert(make_pair(make_pair(name, session), dataBuffer));
+
   return true;
 }
 
diff --git a/model/sync-app-data-publish.h b/model/sync-app-data-publish.h
index d00588a..d072189 100644
--- a/model/sync-app-data-publish.h
+++ b/model/sync-app-data-publish.h
@@ -26,6 +26,7 @@
 #include <boost/unordered_map.hpp>
 #include "sync-seq-no.h"
 #include "sync-ccnx-wrapper.h"
+#include <utility>
 
 namespace Sync {
 
@@ -82,7 +83,7 @@
 private:
   boost::unordered_map<std::string, Seq> m_sequenceLog;
   CcnxWrapperPtr m_ccnxHandle;
-  boost::unordered_map<std::string, std::string> m_recentData;
+  boost::unordered_map<std::pair<std::string, uint32_t>, std::string> m_recentData;
 };
 
 } // Sync
diff --git a/model/sync-interest-table.cc b/model/sync-interest-table.cc
index 767017c..5b1c3e0 100644
--- a/model/sync-interest-table.cc
+++ b/model/sync-interest-table.cc
@@ -45,7 +45,9 @@
 bool SyncInterestTable::insert(string interest)
 {
 	recursive_mutex::scoped_lock lock(m_mutex);
-	m_table.erase(m_table.find(interest));
+	unordered_map<string, time_t>::iterator it = m_table.find(interest);
+	if (it != m_table.end())
+		m_table.erase(it);
 	time_t currentTime = time(0);
 	m_table.insert(make_pair(interest, currentTime));
 }