diff --git a/constant-values.html b/constant-values.html
index 83497a3..23115ff 100644
--- a/constant-values.html
+++ b/constant-values.html
@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_60-ea) on Fri Sep 04 15:17:00 PDT 2015 -->
+<!-- Generated by javadoc (1.8.0_66) on Mon Feb 22 16:40:15 PST 2016 -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Constant Field Values (jndn-management 1.0.0 API)</title>
-<meta name="date" content="2015-09-04">
+<title>Constant Field Values (jndn-management 1.1.0 API)</title>
+<meta name="date" content="2016-02-22">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (jndn-management 1.0.0 API)";
+            parent.document.title="Constant Field Values (jndn-management 1.1.0 API)";
         }
     }
     catch(err) {
@@ -84,7 +84,7 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.<a href="com/intel/jndn/management/NFD.html" title="class in com.intel.jndn.management">NFD</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>com.intel.jndn.management.<a href="com/intel/jndn/management/NdnPingClient.html" title="class in com.intel.jndn.management">NdnPingClient</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -92,19 +92,12 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.NFD.DEFAULT_TIMEOUT">
+<td class="colFirst"><a name="com.intel.jndn.management.NdnPingClient.DEFAULT_TIMEOUT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;long</code></td>
-<td><code><a href="com/intel/jndn/management/NFD.html#DEFAULT_TIMEOUT">DEFAULT_TIMEOUT</a></code></td>
+<td><code><a href="com/intel/jndn/management/NdnPingClient.html#DEFAULT_TIMEOUT">DEFAULT_TIMEOUT</a></code></td>
 <td class="colLast"><code>2000L</code></td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.NFD.OK_STATUS">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/NFD.html#OK_STATUS">OK_STATUS</a></code></td>
-<td class="colLast"><code>200</code></td>
-</tr>
 </tbody>
 </table>
 </li>
@@ -112,7 +105,7 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/ControlResponse.html" title="class in com.intel.jndn.management.types">ControlResponse</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>com.intel.jndn.management.enums.<a href="com/intel/jndn/management/enums/NfdTlv.html" title="class in com.intel.jndn.management.enums">NfdTlv</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -120,299 +113,332 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ControlResponse.TLV_CONTROL_RESPONSE">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.ChannelStatus">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ControlResponse.html#TLV_CONTROL_RESPONSE">TLV_CONTROL_RESPONSE</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#ChannelStatus">ChannelStatus</a></code></td>
+<td class="colLast"><code>130</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.ControlParameters">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#ControlParameters">ControlParameters</a></code></td>
+<td class="colLast"><code>104</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.ControlResponse">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#ControlResponse">ControlResponse</a></code></td>
 <td class="colLast"><code>101</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ControlResponse.TLV_CONTROL_RESPONSE_STATUS_CODE">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.Cost">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ControlResponse.html#TLV_CONTROL_RESPONSE_STATUS_CODE">TLV_CONTROL_RESPONSE_STATUS_CODE</a></code></td>
-<td class="colLast"><code>102</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#Cost">Cost</a></code></td>
+<td class="colLast"><code>106</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ControlResponse.TLV_CONTROL_RESPONSE_STATUS_TEXT">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.CurrentTimestamp">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ControlResponse.html#TLV_CONTROL_RESPONSE_STATUS_TEXT">TLV_CONTROL_RESPONSE_STATUS_TEXT</a></code></td>
-<td class="colLast"><code>103</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/FaceStatus.html" title="class in com.intel.jndn.management.types">FaceStatus</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_CHANNEL_STATUS">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_CHANNEL_STATUS">TLV_CHANNEL_STATUS</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#CurrentTimestamp">CurrentTimestamp</a></code></td>
 <td class="colLast"><code>130</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_EXPIRATION_PERIOD">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.ExpirationPeriod">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_EXPIRATION_PERIOD">TLV_EXPIRATION_PERIOD</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#ExpirationPeriod">ExpirationPeriod</a></code></td>
 <td class="colLast"><code>109</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_FACE_ID">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FaceEventKind">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_FACE_ID">TLV_FACE_ID</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FaceEventKind">FaceEventKind</a></code></td>
+<td class="colLast"><code>193</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FaceEventNotification">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FaceEventNotification">FaceEventNotification</a></code></td>
+<td class="colLast"><code>192</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FaceId">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FaceId">FaceId</a></code></td>
 <td class="colLast"><code>105</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_FACE_PERSISTENCY">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FacePersistency">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_FACE_PERSISTENCY">TLV_FACE_PERSISTENCY</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FacePersistency">FacePersistency</a></code></td>
 <td class="colLast"><code>133</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_FACE_SCOPE">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FaceQueryFilter">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_FACE_SCOPE">TLV_FACE_SCOPE</a></code></td>
-<td class="colLast"><code>132</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FaceQueryFilter">FaceQueryFilter</a></code></td>
+<td class="colLast"><code>150</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_FACE_STATUS">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FaceScope">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_FACE_STATUS">TLV_FACE_STATUS</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FaceScope">FaceScope</a></code></td>
+<td class="colLast"><code>132</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FaceStatus">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FaceStatus">FaceStatus</a></code></td>
+<td class="colLast"><code>128</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.FibEntry">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#FibEntry">FibEntry</a></code></td>
 <td class="colLast"><code>128</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_LINK_TYPE">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.Flags">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_LINK_TYPE">TLV_LINK_TYPE</a></code></td>
-<td class="colLast"><code>134</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#Flags">Flags</a></code></td>
+<td class="colLast"><code>108</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_LOCAL_URI">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.LinkType">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_LOCAL_URI">TLV_LOCAL_URI</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#LinkType">LinkType</a></code></td>
+<td class="colLast"><code>134</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.LocalControlFeature">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#LocalControlFeature">LocalControlFeature</a></code></td>
+<td class="colLast"><code>110</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.LocalUri">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#LocalUri">LocalUri</a></code></td>
 <td class="colLast"><code>129</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_N_IN_BYTES">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NCsEntries">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_N_IN_BYTES">TLV_N_IN_BYTES</a></code></td>
-<td class="colLast"><code>148</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_N_IN_DATAS">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_N_IN_DATAS">TLV_N_IN_DATAS</a></code></td>
-<td class="colLast"><code>145</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_N_IN_INTERESTS">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_N_IN_INTERESTS">TLV_N_IN_INTERESTS</a></code></td>
-<td class="colLast"><code>144</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_N_OUT_BYTES">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_N_OUT_BYTES">TLV_N_OUT_BYTES</a></code></td>
-<td class="colLast"><code>149</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_N_OUT_DATAS">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_N_OUT_DATAS">TLV_N_OUT_DATAS</a></code></td>
-<td class="colLast"><code>147</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_N_OUT_INTERESTS">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_N_OUT_INTERESTS">TLV_N_OUT_INTERESTS</a></code></td>
-<td class="colLast"><code>146</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FaceStatus.TLV_URI">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FaceStatus.html#TLV_URI">TLV_URI</a></code></td>
-<td class="colLast"><code>114</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/FibEntry.html" title="class in com.intel.jndn.management.types">FibEntry</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.FibEntry.TLV_FIB_ENTRY">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/FibEntry.html#TLV_FIB_ENTRY">TLV_FIB_ENTRY</a></code></td>
-<td class="colLast"><code>128</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/ForwarderStatus.html" title="class in com.intel.jndn.management.types">ForwarderStatus</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_CURRENT_TIMESTAMP">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_CURRENT_TIMESTAMP">TLV_CURRENT_TIMESTAMP</a></code></td>
-<td class="colLast"><code>130</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NFD_VERSION">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NFD_VERSION">TLV_NFD_VERSION</a></code></td>
-<td class="colLast"><code>128</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_CS_ENTRIES">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_CS_ENTRIES">TLV_NUM_CS_ENTRIES</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NCsEntries">NCsEntries</a></code></td>
 <td class="colLast"><code>135</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_FIB_ENTRIES">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NextHopRecord">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_FIB_ENTRIES">TLV_NUM_FIB_ENTRIES</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NextHopRecord">NextHopRecord</a></code></td>
+<td class="colLast"><code>129</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NfdVersion">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NfdVersion">NfdVersion</a></code></td>
+<td class="colLast"><code>128</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NFibEntries">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NFibEntries">NFibEntries</a></code></td>
 <td class="colLast"><code>132</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_IN_DATAS">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NInBytes">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_IN_DATAS">TLV_NUM_IN_DATAS</a></code></td>
-<td class="colLast"><code>145</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NInBytes">NInBytes</a></code></td>
+<td class="colLast"><code>148</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_IN_INTERESTS">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NInDatas">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_IN_INTERESTS">TLV_NUM_IN_INTERESTS</a></code></td>
-<td class="colLast"><code>144</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NInDatas">NInDatas</a></code></td>
+<td class="colLast"><code>145</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_MEASUREMENT_ENTRIES">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NInInterests">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_MEASUREMENT_ENTRIES">TLV_NUM_MEASUREMENT_ENTRIES</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NInInterests">NInInterests</a></code></td>
+<td class="colLast"><code>144</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NInNacks">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NInNacks">NInNacks</a></code></td>
+<td class="colLast"><code>151</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NMeasurementsEntries">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NMeasurementsEntries">NMeasurementsEntries</a></code></td>
 <td class="colLast"><code>134</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_NAME_TREE_ENTRIES">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NNameTreeEntries">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_NAME_TREE_ENTRIES">TLV_NUM_NAME_TREE_ENTRIES</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NNameTreeEntries">NNameTreeEntries</a></code></td>
 <td class="colLast"><code>131</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_OUT_DATAS">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NOutBytes">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_OUT_DATAS">TLV_NUM_OUT_DATAS</a></code></td>
-<td class="colLast"><code>147</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NOutBytes">NOutBytes</a></code></td>
+<td class="colLast"><code>149</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_OUT_INTERESTS">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NOutDatas">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_OUT_INTERESTS">TLV_NUM_OUT_INTERESTS</a></code></td>
-<td class="colLast"><code>146</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NOutDatas">NOutDatas</a></code></td>
+<td class="colLast"><code>147</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_NUM_PIT_ENTRIES">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NOutInterests">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_NUM_PIT_ENTRIES">TLV_NUM_PIT_ENTRIES</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NOutInterests">NOutInterests</a></code></td>
+<td class="colLast"><code>146</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NOutNacks">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NOutNacks">NOutNacks</a></code></td>
+<td class="colLast"><code>152</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.NPitEntries">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#NPitEntries">NPitEntries</a></code></td>
 <td class="colLast"><code>133</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.ForwarderStatus.TLV_START_TIMESTAMP">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.Origin">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/ForwarderStatus.html#TLV_START_TIMESTAMP">TLV_START_TIMESTAMP</a></code></td>
-<td class="colLast"><code>129</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#Origin">Origin</a></code></td>
+<td class="colLast"><code>111</code></td>
 </tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/NextHopRecord.html" title="class in com.intel.jndn.management.types">NextHopRecord</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.NextHopRecord.TLV_NEXT_HOP_RECORD">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.RibEntry">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/NextHopRecord.html#TLV_NEXT_HOP_RECORD">TLV_NEXT_HOP_RECORD</a></code></td>
-<td class="colLast"><code>129</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/RibEntry.html" title="class in com.intel.jndn.management.types">RibEntry</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.RibEntry.TLV_RIB_ENTRY">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/RibEntry.html#TLV_RIB_ENTRY">TLV_RIB_ENTRY</a></code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#RibEntry">RibEntry</a></code></td>
 <td class="colLast"><code>128</code></td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.Route">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#Route">Route</a></code></td>
+<td class="colLast"><code>129</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.StartTimestamp">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#StartTimestamp">StartTimestamp</a></code></td>
+<td class="colLast"><code>129</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.StatusCode">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#StatusCode">StatusCode</a></code></td>
+<td class="colLast"><code>102</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.StatusText">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#StatusText">StatusText</a></code></td>
+<td class="colLast"><code>103</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.Strategy">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#Strategy">Strategy</a></code></td>
+<td class="colLast"><code>107</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.StrategyChoice">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#StrategyChoice">StrategyChoice</a></code></td>
+<td class="colLast"><code>128</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.Uri">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#Uri">Uri</a></code></td>
+<td class="colLast"><code>114</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.enums.NfdTlv.UriScheme">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="com/intel/jndn/management/enums/NfdTlv.html#UriScheme">UriScheme</a></code></td>
+<td class="colLast"><code>131</code></td>
+</tr>
 </tbody>
 </table>
 </li>
+</ul>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>com.intel.jndn.management.helpers.<a href="com/intel/jndn/management/helpers/FetchHelper.html" title="class in com.intel.jndn.management.helpers">FetchHelper</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="com.intel.jndn.management.helpers.FetchHelper.DEFAULT_TIMEOUT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;long</code></td>
+<td><code><a href="com/intel/jndn/management/helpers/FetchHelper.html#DEFAULT_TIMEOUT">DEFAULT_TIMEOUT</a></code></td>
+<td class="colLast"><code>2000L</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/Route.html" title="class in com.intel.jndn.management.types">Route</a></span><span class="tabEnd">&nbsp;</span></caption>
@@ -423,30 +449,11 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.Route.TLV_ROUTE">
+<td class="colFirst"><a name="com.intel.jndn.management.types.Route.INFINITE_EXPIRATION_PERIOD">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/Route.html#TLV_ROUTE">TLV_ROUTE</a></code></td>
-<td class="colLast"><code>129</code></td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>com.intel.jndn.management.types.<a href="com/intel/jndn/management/types/StrategyChoice.html" title="class in com.intel.jndn.management.types">StrategyChoice</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th scope="col">Constant Field</th>
-<th class="colLast" scope="col">Value</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a name="com.intel.jndn.management.types.StrategyChoice.TLV_STRATEGY_CHOICE">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="com/intel/jndn/management/types/StrategyChoice.html#TLV_STRATEGY_CHOICE">TLV_STRATEGY_CHOICE</a></code></td>
-<td class="colLast"><code>128</code></td>
+<td><code><a href="com/intel/jndn/management/types/Route.html#INFINITE_EXPIRATION_PERIOD">INFINITE_EXPIRATION_PERIOD</a></code></td>
+<td class="colLast"><code>-1</code></td>
 </tr>
 </tbody>
 </table>
@@ -500,6 +507,6 @@
 <!--   -->
 </a></div>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2015. All rights reserved.</small></p>
+<p class="legalCopy"><small>Copyright &#169; 2016. All rights reserved.</small></p>
 </body>
 </html>
\ No newline at end of file