diff --git a/index-all.html b/index-all.html
index fd7da04..9017445 100644
--- a/index-all.html
+++ b/index-all.html
@@ -2,16 +2,16 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_51) on Mon Apr 13 09:43:53 PDT 2015 -->
+<!-- Generated by javadoc (version 1.7.0_51) on Mon May 11 14:26:39 PDT 2015 -->
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Index (jndn-management 0.9.8 API)</title>
-<meta name="date" content="2015-04-13">
+<title>Index (jndn-management 0.10.0 API)</title>
+<meta name="date" content="2015-05-11">
 <link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Index (jndn-management 0.9.8 API)";
+        parent.document.title="Index (jndn-management 0.10.0 API)";
     }
 //-->
 </script>
@@ -63,7 +63,7 @@
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="#_A_">A</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_E_">E</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_G_">G</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_M_">M</a>&nbsp;<a href="#_N_">N</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_T_">T</a>&nbsp;<a href="#_U_">U</a>&nbsp;<a href="#_V_">V</a>&nbsp;<a href="#_W_">W</a>&nbsp;<a name="_A_">
+<div class="contentContainer"><a href="#_A_">A</a>&nbsp;<a href="#_B_">B</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_E_">E</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_G_">G</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_M_">M</a>&nbsp;<a href="#_N_">N</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_T_">T</a>&nbsp;<a href="#_U_">U</a>&nbsp;<a href="#_V_">V</a>&nbsp;<a href="#_W_">W</a>&nbsp;<a name="_A_">
 <!--   -->
 </a>
 <h2 class="title">A</h2>
@@ -75,11 +75,23 @@
  this is more for debugging; use 'register' instead</div>
 </dd>
 </dl>
+<a name="_B_">
+<!--   -->
+</a>
+<h2 class="title">B</h2>
+<dl>
+<dt><span class="strong"><a href="./com/intel/jndn/management/Strategies.html#BEST_ROUTE">BEST_ROUTE</a></span> - Static variable in class com.intel.jndn.management.<a href="./com/intel/jndn/management/Strategies.html" title="class in com.intel.jndn.management">Strategies</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/Strategies.html#BROADCAST">BROADCAST</a></span> - Static variable in class com.intel.jndn.management.<a href="./com/intel/jndn/management/Strategies.html" title="class in com.intel.jndn.management">Strategies</a></dt>
+<dd>&nbsp;</dd>
+</dl>
 <a name="_C_">
 <!--   -->
 </a>
 <h2 class="title">C</h2>
 <dl>
+<dt><span class="strong"><a href="./com/intel/jndn/management/Strategies.html#CLIENT_CONTROL">CLIENT_CONTROL</a></span> - Static variable in class com.intel.jndn.management.<a href="./com/intel/jndn/management/Strategies.html" title="class in com.intel.jndn.management">Strategies</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="./com/intel/jndn/management/package-summary.html">com.intel.jndn.management</a> - package com.intel.jndn.management</dt>
 <dd>&nbsp;</dd>
 <dt><a href="./com/intel/jndn/management/types/package-summary.html">com.intel.jndn.management.types</a> - package com.intel.jndn.management.types</dt>
@@ -117,6 +129,16 @@
 <div class="block">Helper to decode names using an existing decoding context; could be merged
  to Tlv0_1_1WireFormat.java.</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/EncodingHelper.html#decodeStrategy(java.nio.ByteBuffer)">decodeStrategy(ByteBuffer)</a></span> - Static method in class com.intel.jndn.management.<a href="./com/intel/jndn/management/EncodingHelper.html" title="class in com.intel.jndn.management">EncodingHelper</a></dt>
+<dd>
+<div class="block">Helper to decode strategies since Tlv0_1_1WireFormat.java uses its own
+ internal, protected implementation.</div>
+</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/EncodingHelper.html#decodeStrategy(net.named_data.jndn.encoding.tlv.TlvDecoder)">decodeStrategy(TlvDecoder)</a></span> - Static method in class com.intel.jndn.management.<a href="./com/intel/jndn/management/EncodingHelper.html" title="class in com.intel.jndn.management">EncodingHelper</a></dt>
+<dd>
+<div class="block">Helper to decode strategies using an existing decoding context; could be
+ merged to Tlv0_1_1WireFormat.java.</div>
+</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/NFD.html#DEFAULT_TIMEOUT">DEFAULT_TIMEOUT</a></span> - Static variable in class com.intel.jndn.management.<a href="./com/intel/jndn/management/NFD.html" title="class in com.intel.jndn.management">NFD</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/NFD.html#destroyFace(net.named_data.jndn.Face, int)">destroyFace(Face, int)</a></span> - Static method in class com.intel.jndn.management.<a href="./com/intel/jndn/management/NFD.html" title="class in com.intel.jndn.management">NFD</a></dt>
@@ -152,6 +174,16 @@
 <div class="block">Helper to encode names using an existing encoding context; could be merged
  to Tlv0_1_1WireFormat.java.</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/EncodingHelper.html#encodeStrategy(net.named_data.jndn.Name)">encodeStrategy(Name)</a></span> - Static method in class com.intel.jndn.management.<a href="./com/intel/jndn/management/EncodingHelper.html" title="class in com.intel.jndn.management">EncodingHelper</a></dt>
+<dd>
+<div class="block">Helper to encode strategies since Tlv0_1_1WireFormat.java uses its own
+ internal, protected implementation.</div>
+</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/EncodingHelper.html#encodeStrategy(net.named_data.jndn.Name, net.named_data.jndn.encoding.tlv.TlvEncoder)">encodeStrategy(Name, TlvEncoder)</a></span> - Static method in class com.intel.jndn.management.<a href="./com/intel/jndn/management/EncodingHelper.html" title="class in com.intel.jndn.management">EncodingHelper</a></dt>
+<dd>
+<div class="block">Helper to encode strategies using an existing decoding context; could be
+ merged to Tlv0_1_1WireFormat.java.</div>
+</dd>
 <dt><a href="./com/intel/jndn/management/EncodingHelper.html" title="class in com.intel.jndn.management"><span class="strong">EncodingHelper</span></a> - Class in <a href="./com/intel/jndn/management/package-summary.html">com.intel.jndn.management</a></dt>
 <dd>
 <div class="block">Provide helper methods to cover areas too protected in Tlv0_1_1WireFormat;
@@ -307,6 +339,8 @@
 <dd>
 <div class="block">Get name</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#getName()">getName()</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/ForwarderStatus.html#getNfdVersion()">getNfdVersion()</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/ForwarderStatus.html" title="class in com.intel.jndn.management.types">ForwarderStatus</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/ForwarderStatus.html#getNumCsEntries()">getNumCsEntries()</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/ForwarderStatus.html" title="class in com.intel.jndn.management.types">ForwarderStatus</a></dt>
@@ -375,6 +409,14 @@
 <dd>
 <div class="block">Get status text</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#getStrategy()">getStrategy()</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/NFD.html#getStrategyList(net.named_data.jndn.Face)">getStrategyList(Face)</a></span> - Static method in class com.intel.jndn.management.<a href="./com/intel/jndn/management/NFD.html" title="class in com.intel.jndn.management">NFD</a></dt>
+<dd>
+<div class="block">Retrieve the list of strategy choice entries from the NFD; calls
+ /localhost/nfd/rib/list which requires a local Face (all non-local packets
+ are dropped).</div>
+</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/FaceStatus.html#getUri()">getUri()</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/FaceStatus.html" title="class in com.intel.jndn.management.types">FaceStatus</a></dt>
 <dd>
 <div class="block">Get face ID</div>
@@ -414,6 +456,8 @@
 </a>
 <h2 class="title">N</h2>
 <dl>
+<dt><span class="strong"><a href="./com/intel/jndn/management/Strategies.html#NCC">NCC</a></span> - Static variable in class com.intel.jndn.management.<a href="./com/intel/jndn/management/Strategies.html" title="class in com.intel.jndn.management">Strategies</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="./com/intel/jndn/management/types/NextHopRecord.html" title="class in com.intel.jndn.management.types"><span class="strong">NextHopRecord</span></a> - Class in <a href="./com/intel/jndn/management/types/package-summary.html">com.intel.jndn.management.types</a></dt>
 <dd>
 <div class="block">Represent a NextHopRecord in a FibEntry; see
@@ -587,6 +631,8 @@
 <dd>
 <div class="block">Set name</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#setName(net.named_data.jndn.Name)">setName(Name)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/ForwarderStatus.html#setNfdVersion(java.lang.String)">setNfdVersion(String)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/ForwarderStatus.html" title="class in com.intel.jndn.management.types">ForwarderStatus</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/ForwarderStatus.html#setNumCsEntries(long)">setNumCsEntries(long)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/ForwarderStatus.html" title="class in com.intel.jndn.management.types">ForwarderStatus</a></dt>
@@ -649,6 +695,8 @@
  <a href="http://redmine.named-data.net/projects/nfd/wiki/StrategyChoice">http://redmine.named-data.net/projects/nfd/wiki/StrategyChoice</a>
  for protocol documentation.</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#setStrategy(net.named_data.jndn.Name)">setStrategy(Name)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/FaceStatus.html#setUri(java.lang.String)">setUri(String)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/FaceStatus.html" title="class in com.intel.jndn.management.types">FaceStatus</a></dt>
 <dd>
 <div class="block">Set URI</div>
@@ -660,6 +708,20 @@
 </dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/StatusDataset.html#StatusDataset()">StatusDataset()</a></span> - Constructor for class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StatusDataset.html" title="class in com.intel.jndn.management.types">StatusDataset</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="./com/intel/jndn/management/Strategies.html" title="class in com.intel.jndn.management"><span class="strong">Strategies</span></a> - Class in <a href="./com/intel/jndn/management/package-summary.html">com.intel.jndn.management</a></dt>
+<dd>
+<div class="block">A reference list of the strategies available in NFD; should match
+ <a href="http://redmine.named-data.net/projects/nfd/wiki/StrategyChoice#Strategy">
+ http://redmine.named-data.net/projects/nfd/wiki/StrategyChoice#Strategy</a></div>
+</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/Strategies.html#Strategies()">Strategies()</a></span> - Constructor for class com.intel.jndn.management.<a href="./com/intel/jndn/management/Strategies.html" title="class in com.intel.jndn.management">Strategies</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types"><span class="strong">StrategyChoice</span></a> - Class in <a href="./com/intel/jndn/management/types/package-summary.html">com.intel.jndn.management.types</a></dt>
+<dd>
+<div class="block">Represent a strategy choice entry.</div>
+</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#StrategyChoice()">StrategyChoice()</a></span> - Constructor for class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="_T_">
 <!--   -->
@@ -747,6 +809,11 @@
 </dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/ForwarderStatus.html#TLV_START_TIMESTAMP">TLV_START_TIMESTAMP</a></span> - Static variable in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/ForwarderStatus.html" title="class in com.intel.jndn.management.types">ForwarderStatus</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#TLV_STRATEGY_CHOICE">TLV_STRATEGY_CHOICE</a></span> - Static variable in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>
+<div class="block">TLV type, see
+ <a href="http://redmine.named-data.net/projects/nfd/wiki/StrategyChoice#TLV-TYPE-assignments">http://redmine.named-data.net/projects/nfd/wiki/StrategyChoice#TLV-TYPE-assignments</a></div>
+</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/FaceStatus.html#TLV_URI">TLV_URI</a></span> - Static variable in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/FaceStatus.html" title="class in com.intel.jndn.management.types">FaceStatus</a></dt>
 <dd>&nbsp;</dd>
 </dl>
@@ -787,6 +854,12 @@
  <a href="http://redmine.named-data.net/projects/nfd/wiki/RibMgmt">http://redmine.named-data.net/projects/nfd/wiki/RibMgmt</a>
  for protocol documentation.</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/NFD.html#unsetStrategy(net.named_data.jndn.Face, net.named_data.jndn.Name)">unsetStrategy(Face, Name)</a></span> - Static method in class com.intel.jndn.management.<a href="./com/intel/jndn/management/NFD.html" title="class in com.intel.jndn.management">NFD</a></dt>
+<dd>
+<div class="block">Set a strategy on the forwarder; see
+ <a href="./com/intel/jndn/management/NFD.html#setStrategy(net.named_data.jndn.Face, net.named_data.jndn.Name, net.named_data.jndn.Name)"><code>NFD.setStrategy(net.named_data.jndn.Face, net.named_data.jndn.Name, net.named_data.jndn.Name)</code></a>
+ for more information.</div>
+</dd>
 </dl>
 <a name="_V_">
 <!--   -->
@@ -898,6 +971,14 @@
 <div class="block">Decode multiple status entries as part of a StatusDataset, see
  <a href="http://redmine.named-data.net/projects/nfd/wiki/StatusDataset">http://redmine.named-data.net/projects/nfd/wiki/StatusDataset</a></div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#wireDecode(java.nio.ByteBuffer)">wireDecode(ByteBuffer)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>
+<div class="block">Decode the input from its TLV format.</div>
+</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#wireDecode(net.named_data.jndn.encoding.tlv.TlvDecoder)">wireDecode(TlvDecoder)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>
+<div class="block">Decode as part of an existing decode context.</div>
+</dd>
 <dt><span class="strong"><a href="./com/intel/jndn/management/types/ControlResponse.html#wireEncode()">wireEncode()</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/ControlResponse.html" title="class in com.intel.jndn.management.types">ControlResponse</a></dt>
 <dd>
 <div class="block">Encode using a new TLV encoder.</div>
@@ -954,8 +1035,16 @@
 <dd>
 <div class="block">Encode as part of an existing encode context.</div>
 </dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#wireEncode()">wireEncode()</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>
+<div class="block">Encode using a new TLV encoder.</div>
+</dd>
+<dt><span class="strong"><a href="./com/intel/jndn/management/types/StrategyChoice.html#wireEncode(net.named_data.jndn.encoding.tlv.TlvEncoder)">wireEncode(TlvEncoder)</a></span> - Method in class com.intel.jndn.management.types.<a href="./com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></dt>
+<dd>
+<div class="block">Encode as part of an existing encode context.</div>
+</dd>
 </dl>
-<a href="#_A_">A</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_E_">E</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_G_">G</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_M_">M</a>&nbsp;<a href="#_N_">N</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_T_">T</a>&nbsp;<a href="#_U_">U</a>&nbsp;<a href="#_V_">V</a>&nbsp;<a href="#_W_">W</a>&nbsp;</div>
+<a href="#_A_">A</a>&nbsp;<a href="#_B_">B</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_E_">E</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_G_">G</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_M_">M</a>&nbsp;<a href="#_N_">N</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_T_">T</a>&nbsp;<a href="#_U_">U</a>&nbsp;<a href="#_V_">V</a>&nbsp;<a href="#_W_">W</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar_bottom">
 <!--   -->