diff --git a/helper/ccnx-stack-helper.cc b/helper/ccnx-stack-helper.cc
index a40e39a..34010e4 100644
--- a/helper/ccnx-stack-helper.cc
+++ b/helper/ccnx-stack-helper.cc
@@ -61,6 +61,7 @@
   , m_needSetDefaultRoutes (false)
 {
   m_strategyFactory.SetTypeId ("ns3::CcnxFloodingStrategy");
+  m_contentStoreFactory.SetTypeId ("ns3::CcnxContentStoreLru");
 }
     
 CcnxStackHelper::~CcnxStackHelper ()
@@ -68,11 +69,16 @@
 }
 
 void 
-CcnxStackHelper::SetForwardingStrategy (std::string strategy)
+CcnxStackHelper::SetForwardingStrategy (const std::string &strategy)
 {
   m_strategyFactory.SetTypeId (strategy);
 }
 
+void
+CcnxStackHelper::SetContentStore (const std::string &contentStore)
+{
+  m_contentStoreFactory.SetTypeId (contentStore);
+}
 
 void
 CcnxStackHelper::SetDefaultRoutes (bool needSet)
diff --git a/helper/ccnx-stack-helper.h b/helper/ccnx-stack-helper.h
index f7ebd62..afd797b 100644
--- a/helper/ccnx-stack-helper.h
+++ b/helper/ccnx-stack-helper.h
@@ -68,19 +68,24 @@
   virtual ~CcnxStackHelper ();
 
   /**
-   * @brief Set forwarding strategy helper
+   * @brief Set forwarding strategy class
+   * @param forwardingStrategy string containing name of the forwarding strategy class
    *
-   * \param forwarding a new forwarding helper
+   * Valid options are "ns3::CcnxFloodingStrategy" (default) and "ns3::CcnxBestRouteStrategy"
    *
-   * Set the forwarding helper to use during Install. The forwarding helper is
-   * really an object factory which is used to create an object of type
-   * ns3::CcnxL3Protocol per node. This forwarding object is then associated to
-   * a single ns3::Ccnx object through its ns3::Ccnx::SetforwardingProtocol.
+   * Other strategies can be implemented, inheriting ns3::CcnxForwardingStrategy class
    */
   void
-  SetForwardingStrategy (std::string forwardingStrategy);
+  SetForwardingStrategy (const std::string &forwardingStrategy);
 
   /**
+   * @brief Set content store class
+   * @param contentStore string, representing class of the content store
+   */
+  void
+  SetContentStore (const std::string &contentStore);
+  
+  /**
    * @brief Enable Interest limits (disabled by default)
    *
    * @param enable           Enable or disable limits
@@ -177,6 +182,7 @@
   
 private:
   ObjectFactory m_strategyFactory;
+  ObjectFactory m_contentStoreFactory;
   bool m_limitsEnabled;
   Time     m_avgRtt;
   uint32_t m_avgContentObjectSize;